Skip to content

Commit

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

13 commits in a1f47ec3f7cd076986f1bfcd7061f2e8cb1a726e..3ed207e416fb2f678a40cc79c02dcf4f936a21ce
2024-06-15 01:10:07 +0000 to 2024-06-18 19:18:22 +0000
- test: prefer raw string for regex reduction (rust-lang/cargo#14099)
- test: migrate tree and tree_graph_features to snapbox (rust-lang/cargo#14094)
- test: Migrate some files to snapbox (rust-lang/cargo#14069)
- remove some legacy public dependency code from the resolver (rust-lang/cargo#14090)
- fix(fix): Address problems with implicit -> explicit feature migration (rust-lang/cargo#14018)
- refactor: 1.79 cleanup (rust-lang/cargo#14088)
- test: migrate `git_(gc|shallow)` to snapbox (rust-lang/cargo#14087)
- test: migrate timings_works to snapbox (rust-lang/cargo#14082)
- test: migrate minimal_versions to snapbox (rust-lang/cargo#14080)
- Remove `run_expect_error` to avoid tests incorrectly passing (rust-lang/cargo#14078)
- test: migrate help to snapbox (rust-lang/cargo#14060)
- test: Migrate tests/testsuite/co*.rs to snapbox (rust-lang/cargo#14079)
- Use `std::fs::absolute` instead of reimplementing it (rust-lang/cargo#14075)

<!--
r? ghost
-->
  • Loading branch information
@bors
bors committed Jun 19, 2024
2 parents a1ca449 + 087add3 commit 9889a6f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 33 files
+2 −2 Cargo.lock
+2 −2 Cargo.toml
+1 −1 crates/cargo-test-macro/Cargo.toml
+1 −1 crates/cargo-test-support/Cargo.toml
+8 −8 crates/cargo-test-support/src/compare.rs
+0 −9 crates/cargo-test-support/src/lib.rs
+0 −4 crates/xtask-bump-check/src/xtask.rs
+0 −5 src/cargo/core/resolver/conflict_cache.rs
+0 −8 src/cargo/core/resolver/errors.rs
+0 −4 src/cargo/core/resolver/mod.rs
+0 −13 src/cargo/core/resolver/types.rs
+43 −9 src/cargo/ops/fix.rs
+2 −53 src/cargo/util/mod.rs
+73 −50 tests/testsuite/build_script_extra_link_arg.rs
+0 −2 tests/testsuite/cache_lock.rs
+114 −60 tests/testsuite/cache_messages.rs
+30 −29 tests/testsuite/check_cfg.rs
+98 −80 tests/testsuite/collisions.rs
+13 −14 tests/testsuite/concurrent.rs
+4 −3 tests/testsuite/config.rs
+0 −2 tests/testsuite/config_cli.rs
+12 −15 tests/testsuite/config_include.rs
+0 −2 tests/testsuite/corrupt_git.rs
+137 −52 tests/testsuite/fix.rs
+3 −2 tests/testsuite/freshness.rs
+0 −2 tests/testsuite/git_gc.rs
+0 −2 tests/testsuite/git_shallow.rs
+16 −21 tests/testsuite/help.rs
+0 −2 tests/testsuite/member_discovery.rs
+5 −7 tests/testsuite/minimal_versions.rs
+9 −11 tests/testsuite/timings.rs
+486 −559 tests/testsuite/tree.rs
+120 −133 tests/testsuite/tree_graph_features.rs

0 comments on commit 9889a6f

Please sign in to comment.