fix incorrect path resolution in tidy #122209
Merged
Conversation
This file contains 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
|
rustbot has assigned @Mark-Simulacrum. Use r? to explicitly pick a reviewer |
rustbot
added
A-testsuite
compiler-errors
requested changes
Mar 8, 2024
src/tools/tidy/src/ui_tests.rs
Outdated
| @@ -184,7 +185,7 @@ pub fn check(path: &Path, bless: bool, bad: &mut bool) { | |||
| */ | |||
| [ | |||
| "#; | |||
| let tidy_src = std::env::current_dir().unwrap().join("src/tools/tidy/src"); | |||
| let tidy_src = PathBuf::from(env::args_os().nth(1).unwrap()).join("src/tools/tidy/src"); | |||
There was a problem hiding this comment.
This solution is really unnecessarily cryptic, imo. A better solution would be to pass in the root_path here rather than the tests_path:
rust/src/tools/tidy/src/main.rs
Line 105 in a655e64
And then adjust the rest of this file to operate from the root, rather than the test dir.
klensy
reviewed
Mar 8, 2024
src/tools/tidy/src/issues.txt
Outdated
Comment on lines
186
to
187
| "ui/async-await/issue-68523.rs", | ||
| "ui/async-await/issue-68523-start.rs", | ||
| "ui/async-await/issue-68523.rs", |
There was a problem hiding this comment.
PR shouldn't affect ordering here, why it changed?
There was a problem hiding this comment.
preexisting: these weren't sorted, see #122161 (comment)
There was a problem hiding this comment.
@onur-ozkan Can you rebase this? It should remove these diffs since master should contain the relevant fix.
onur-ozkan
force-pushed
the
fix-tidy-path-resolution
branch
from
3c67ab6
to
b51627c
Compare
Previously, reading the current path from the environment led to failure when invoking x from outside the source root. This change fixes this issue by passing the already resolved root path into `ui_tests::check`. Signed-off-by: onur-ozkan <work@onurozkan.dev>
onur-ozkan
force-pushed
the
fix-tidy-path-resolution
branch
from
b51627c
to
7c13421
Compare
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 9, 2024
…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#121358 (Reduce alignment of TypeId to u64 alignment) - rust-lang#121813 (Misc improvements to non local defs lint implementation) - rust-lang#122160 (Eagerly translate `HelpUseLatestEdition` in parser diagnostics) - rust-lang#122178 (ci: add a runner for vanilla LLVM 18) - rust-lang#122187 (Move metadata header and version checks together) - rust-lang#122209 (fix incorrect path resolution in tidy) - rust-lang#122215 (Some tweaks to the parallel query cycle handler) - rust-lang#122223 (Fix typo in `VisitorResult`) - rust-lang#122224 (Add missing regression tests) - rust-lang#122232 (library/core: fix a comment, and a cfg(miri) warning) - rust-lang#122233 (miri: do not apply aliasing restrictions to Box with custom allocator) - rust-lang#122237 (Remove `Ord` from `ClosureKind`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 9, 2024
Rollup merge of rust-lang#122209 - onur-ozkan:fix-tidy-path-resolution, r=compiler-errors fix incorrect path resolution in tidy Previously, reading the current path from the environment led to failure when invoking x from outside the source root. This change fixes this issue by passing the already resolved root path into `ui_tests::check`. Fixes rust-lang#122202
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously, reading the current path from the environment led to failure when invoking x from outside the source root. This change fixes this issue by passing the already resolved root path into
ui_tests::check.Fixes #122202