Update rental hack to work with remapped paths.#106816
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 14, 2023
Merged
Conversation
Collaborator
|
r? @oli-obk (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Contributor
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 13, 2023
Update `rental` hack to work with remapped paths. This PR simply switches to an already-existing helper instead of hard-coding a specific enum variant. The new revision of the test fails without the other changes in this PR. Context: I'm exploring running UI tests with remapped paths by default in rust-lang#105924 and the rental test was one of the ones that failed. This may also be useful in the context of rust-lang/rfcs#3127 ("New rustc and Cargo options to allow path sanitisation by default").
Member
bors
added
S-waiting-on-author
rustbot
added
A-testsuite
Contributor
Author
|
Ugh, Windows paths. Sorry for the inconvenience. Looks like the remapped paths aren't recognized by compiletest and thus aren't automatically normalized. I added some manual normalization which should hopefully work but I don't have a Windows environment available to test. I've temporarily enabled two Windows buildbots, please don't approve right now. |
Contributor
Author
|
The job that failed in the rollup passed with the path normalization fix: https://github.com/rust-lang/rust/actions/runs/3914244020/jobs/6691084328 Removed the temporary CI changes and squashed the fix, so this should be ready for review again, @matthiaskrgr / @oli-obk. |
Member
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
Member
|
@bors r- r=oli-obk |
bors
added
S-waiting-on-author
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 14, 2023
Rollup of 13 pull requests Successful merges: - rust-lang#104965 (reword Option::as_ref and Option::map examples) - rust-lang#105172 (Added error documentation for write_fmt) - rust-lang#106605 (rustdoc: fix outdated lint section of the book) - rust-lang#106670 (Check compiler docs in PR CI) - rust-lang#106692 (mv binary_heap.rs binary_heap/mod.rs) - rust-lang#106693 (rustdoc: rename CSS rustdoc-toggle -> toggle and toggle -> settings-toggle) - rust-lang#106707 (Remove duplicate sha-1 dependency) - rust-lang#106762 (Add `AtomicPtr::as_mut_ptr`) - rust-lang#106766 (Remove dead code in rustdoc stripper) - rust-lang#106775 (Remove stale reference to the test suite location) - rust-lang#106799 (Stop having unused lifetimes on some `impl`s) - rust-lang#106816 (Update `rental` hack to work with remapped paths.) - rust-lang#106819 (rustdoc: remove unnecessary DOM class `h1.fqn`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR simply switches to an already-existing helper instead of hard-coding a specific enum variant. The new revision of the test fails without the other changes in this PR.
Context: I'm exploring running UI tests with remapped paths by default in #105924 and the rental test was one of the ones that failed.
This may also be useful in the context of rust-lang/rfcs#3127 ("New rustc and Cargo options to allow path sanitisation by default").