Skip to content

Commit

Permalink
Auto merge of #126955 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history 
Update cargo

10 commits in bc89bffa5987d4af8f71011c7557119b39e44a65..4ed7bee47f7dd4416b36fada1909e9a62c546246
2024-06-22 00:36:36 +0000 to 2024-06-25 16:28:22 +0000
- test: omit target-dir name (rust-lang/cargo#14142)
- test: migrate offline, open_namespaces and owner to snapbox (rust-lang/cargo#14138)
- docs: remove stray comment (rust-lang/cargo#14133)
- Change tests to support `rustc` wording changes (rust-lang/cargo#14135)
- deps: dont use tracing-attributes for workspace, use for cargo only (rust-lang/cargo#14122)
- Include vcs_info even if workspace is dirty (rust-lang/cargo#13960)
- test: migrate profile* to snapbox (rust-lang/cargo#14128)
- test: migrate path and paths to snapbox (rust-lang/cargo#14109)
- test: migrate rustflags, rustup and script to snapbox (rust-lang/cargo#14126)
- test: migrate rename_deps, replace, required_features and run to snapbox (rust-lang/cargo#14127)
  • Loading branch information
@bors
bors committed Jun 26, 2024
2 parents 31f8b70 + f405977 commit a299aa5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 32 files
+2 −2 Cargo.toml
+5 −0 crates/cargo-test-support/src/compare.rs
+0 −2 src/cargo/core/resolver/encode.rs
+20 −14 src/cargo/ops/cargo_package.rs
+7 −3 src/doc/man/cargo-package.md
+7 −3 src/doc/man/generated_txt/cargo-package.txt
+7 −3 src/doc/src/commands/cargo-package.md
+7 −3 src/etc/man/cargo-package.1
+2 −1 tests/testsuite/check.rs
+1 −0 tests/testsuite/git.rs
+1 −1 tests/testsuite/message_format.rs
+1 −1 tests/testsuite/metabuild.rs
+115 −101 tests/testsuite/offline.rs
+50 −40 tests/testsuite/open_namespaces.rs
+17 −17 tests/testsuite/owner.rs
+112 −0 tests/testsuite/package.rs
+233 −196 tests/testsuite/path.rs
+41 −26 tests/testsuite/paths.rs
+86 −88 tests/testsuite/profile_config.rs
+126 −121 tests/testsuite/profile_custom.rs
+82 −55 tests/testsuite/profile_overrides.rs
+294 −246 tests/testsuite/profile_targets.rs
+110 −146 tests/testsuite/profile_trim_paths.rs
+155 −168 tests/testsuite/profiles.rs
+1 −0 tests/testsuite/publish_lockfile.rs
+24 −27 tests/testsuite/rename_deps.rs
+214 −225 tests/testsuite/replace.rs
+451 −307 tests/testsuite/required_features.rs
+403 −303 tests/testsuite/run.rs
+396 −163 tests/testsuite/rustflags.rs
+16 −21 tests/testsuite/rustup.rs
+480 −537 tests/testsuite/script.rs

0 comments on commit a299aa5

Please sign in to comment.