fix: resolve current_rs! paths in nested Cargo workspaces#449
Closed
leno23 wants to merge 1 commit into
Closed
Conversation
When CARGO_MANIFEST_DIR points at the package being tested, use it as the rustc current dir if file! resolves there. Otherwise keep the workspace-root fallback for workspace-relative file! paths. Fixes assert-rs#415
leno23
force-pushed
the
fix/nested-workspace-current-rs-415
branch
from
898504f to
8e94911
Compare
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
2 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.
Summary
current_rs!()/current_dir!()/cargo_rustc_current_dir!()in nested workspace layouts (e.g. a sub-workspace excluded from the root workspace).CARGO_MANIFEST_DIRwhenfile!resolves relative to the package directory.file!is workspace-relative (snapbox’s own workspace build).Test plan
cargo test -p snapboxcurrent_rs_points_at_this_fileunit testsnapbox::current_rs!(), etc. give wrong path in nested workspaces #415 (snapbox-bug/sub-ws/foo)Fixes #415
Made with Cursor