refactor(source): More RecursivePathSource clean up #14231
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
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
rustbot
added
Command-read-manifest
S-waiting-on-review
epage
added a commit
to epage/cargo
that referenced
this pull request
Jul 10, 2024
This came up in rust-lang#14231 ``` ---- expected: tests/testsuite/lto.rs:611:27 ++++ actual: stderr 1 1 | [FRESH] registry-shared v0.0.1 2 2 | [FRESH] registry v0.0.1 3 3 | [COMPILING] bar v0.0.0 ([ROOT]/foo/bar) 4 4 | [RUNNING] `rustc --crate-name bar [..]-C lto [..]--test [..]` 5 5 | [RUNNING] `rustc --crate-name b [..]-C lto [..]--test [..]` 6 - [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s 7 6 | [RUNNING] `[ROOT]/foo/target/release/deps/bar-[HASH][EXE]` 8 7 | [RUNNING] `[ROOT]/foo/target/release/deps/b-[HASH][EXE]` 9 8 | [DOCTEST] bar 10 9 | [RUNNING] `rustdoc --edition=2015 --crate-type cdylib --crate-type rlib --crate-name bar --test [..]-C lto [..] 10 + [FINISHED] `release` profile [optimized] target(s) in 1m 00s Update with SNAPSHOTS=overwrite ```
bors
added a commit
that referenced
this pull request
Jul 10, 2024
fix(test): Redact elapsed time in the minutes time frame ### What does this PR try to resolve? This came up in #14231 ``` ---- expected: tests/testsuite/lto.rs:611:27 ++++ actual: stderr 1 1 | [FRESH] registry-shared v0.0.1 2 2 | [FRESH] registry v0.0.1 3 3 | [COMPILING] bar v0.0.0 ([ROOT]/foo/bar) 4 4 | [RUNNING] `rustc --crate-name bar [..]-C lto [..]--test [..]` 5 5 | [RUNNING] `rustc --crate-name b [..]-C lto [..]--test [..]` 6 - [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s 7 6 | [RUNNING] `[ROOT]/foo/target/release/deps/bar-[HASH][EXE]` 8 7 | [RUNNING] `[ROOT]/foo/target/release/deps/b-[HASH][EXE]` 9 8 | [DOCTEST] bar 10 9 | [RUNNING] `rustdoc --edition=2015 --crate-type cdylib --crate-type rlib --crate-name bar --test [..]-C lto [..] 10 + [FINISHED] `release` profile [optimized] target(s) in 1m 00s Update with SNAPSHOTS=overwrite ``` ### How should we test and review this PR? ### Additional information
epage
force-pushed
the
git-clean
branch
2 times, most recently
from
cb606d6
to
4c705a4
Compare
|
☔ The latest upstream changes (presumably #14238) made this pull request unmergeable. Please resolve the merge conflicts. |
This prepares the way for moving `walk` from `read_packages` into here.
This is tied to the `Source` and only used there.
Primary benefit: looking to track more state in `RecursivePathSource` and this is a stepping stone. Minor benefits: - Cleaner - Avoid re-allocating - Faster lookup for `download`
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
that referenced
this pull request
Jul 15, 2024
fix(source): Don't warn about unreferenced duplicate packages ### What does this PR try to resolve? This also improves the message, consolidating multiple duplicates and saying which was loaded instead, as it naturally fell out of the design Fixes #10752 ### How should we test and review this PR? ### Additional information We're still subject to #13724 and fully load every manifest, even if we don't use it. I'm exploring that topic at https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Redundant.20code.20in.20.60GitSouce.60.3F/near/450783427 This change builds on - #13993 - #14169 - #14231 - #14234
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 17, 2024
Update cargo 31 commits in 154fdac39ae9629954e19e9986fd2cf2cdd8d964..a2b58c3dad4d554ba01ed6c45c41ff85390560f2 2024-07-07 01:28:23 +0000 to 2024-07-16 00:52:02 +0000 - chore(ci): bump CI tools (rust-lang/cargo#14257) - test: migrate fetch and list_availables to snapbox (rust-lang/cargo#14214) - chore: downgrade to jobserver@0.1.28 (rust-lang/cargo#14254) - perf(source): Don't `du` on every git source load (rust-lang/cargo#14252) - fix(source): Don't warn about unreferenced duplicate packages (rust-lang/cargo#14239) - feat(test): Add cargo_test to test-support prelude (rust-lang/cargo#14243) - Add workflow to publish Cargo automatically (rust-lang/cargo#14202) - test: migrate implicit_features to snapbox (rust-lang/cargo#14245) - test: migrate build-std/main to snapbox (rust-lang/cargo#14241) - test: migrate check_cfg to snapbox (rust-lang/cargo#14235) - refactor(source): More RecursivePathSource clean up (rust-lang/cargo#14231) - Add more profiling traces (rust-lang/cargo#14238) - fix(overrides): Don't warn on duplicate packages from using '..' (rust-lang/cargo#14234) - fix(test): Redact elapsed time in the minutes time frame (rust-lang/cargo#14233) - test: Migrate lto tests to snapbox (rust-lang/cargo#14209) - fix: Ensure dep/feature activates the dependency on 2024 (rust-lang/cargo#14221) - chore(docs): update index of reference (rust-lang/cargo#14228) - test: migrate test to snapbox (rust-lang/cargo#14226) - chore: remove duplicate words (rust-lang/cargo#14229) - docs(contrib): Document things I look for in RFCs (rust-lang/cargo#14222) - docs(ref): Note MSRV for features in the docs (rust-lang/cargo#14224) - test(progress): Resolve flakiness (rust-lang/cargo#14223) - fix(test): Reduce over-prescription to the caller (rust-lang/cargo#14217) - refactor: move get_source_id out of registry (rust-lang/cargo#14218) - fix: rename to `rustdoc::broken_intra_doc_links` (rust-lang/cargo#14215) - test: migrate member_errors, multitarget and new to snapbox (rust-lang/cargo#14210) - test: migrate generate_lockfile and glob_targets to snapbox (rust-lang/cargo#14200) - test: Ensure --list test works with cargo-bloat (rust-lang/cargo#14213) - dont make new constant InternedString in hot path (rust-lang/cargo#14211) - Fix compatible_with_older_cargo test. (rust-lang/cargo#14212) - test: migrate metabuild, metadata and net_config to snapbox (rust-lang/cargo#14162)
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.
What does this PR try to resolve?
This is a follow up to #13993 and #14169 and is part of my work towards #10752.
How should we test and review this PR?
Additional information