fix(config): normalize included config paths #16964
Merged
epage merged 2 commits intorust-lang:masterfrom May 4, 2026
Merged
Conversation
Without normalizing included config paths, `Definition::root()` will do `parent().parent()` on non-normalized paths containing `..` segments. And that will remove `..` and result in wrong path resolution.
Collaborator
|
r? @ehuss rustbot has assigned @ehuss. Use Why was this reviewer chosen?The reviewer was selected based on:
|
epage
approved these changes
May 4, 2026
rust-bors Bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
May 9, 2026
Update cargo submodule 13 commits in 4f9b52075316e9ced380c8fa492858048d5758b6..a343accce8526b128adc517d33348573d22920a3 2026-05-01 22:36:41 +0000 to 2026-05-08 22:41:35 +0000 - docs(guide): Fix a typo (rust-lang/cargo#16980) - chore(deps): update msrv (3 versions) to v1.93 (rust-lang/cargo#16979) - refactor(diag): Move lints to diagnostics (rust-lang/cargo#16978) - refactor(lints): Pull out `unknown_lints` lint logic and `missing_lints_features` diagnostic logic (rust-lang/cargo#16976) - refactor(lints): Move things out of `lints/mod.rs` (rust-lang/cargo#16975) - test: cover search API redirects (rust-lang/cargo#16971) - refactor(lints): Instrument lints for logging (rust-lang/cargo#16972) - docs: `.cargo-checksum.json` is not a security mechanism (rust-lang/cargo#16966) - fix(vendor): add `$comment` to `.cargo-checksum.json` (rust-lang/cargo#16967) - test: Fixed arg order in rustdoc json test (rust-lang/cargo#16968) - fix(config): `[env]` relative paths definition (rust-lang/cargo#16957) - fix(config): normalize included config paths (rust-lang/cargo#16964) - Fix heading level of `build.warnings` documentation. (rust-lang/cargo#16961) r? ghost
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
4 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.
What does this PR try to resolve?
Extracted from #16957.
Without normalizing included config paths,
Definition::root()will doparent().parent()on non-normalized paths containing
..segments.And that will remove
..and result in wrong path resolution.How to test and review this PR?
Two tested are added to showcase the buggy behavior, especially
env_relative_path_included_from_upper_levelwhich was a wrong path resolution.