Skip to content

Commit

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

8 commits in 4c39aaff66862cc0da52fe529aa1990bb8bb9a22..3908f64086a3d7b9af8d87b4da2bd100776c3e61
2024-11-25 16:36:17 +0000 to 2024-11-29 17:32:44 +0000
- chore(deps): update msrv (rust-lang/cargo#14867)
- fix(fix): Migrate cargo script manifests across editions (rust-lang/cargo#14864)
- feat(toml): Allow adding/removing from cargo scripts (rust-lang/cargo#14857)
- Add future-incompat warning against keywords in cfgs and add raw-idents (rust-lang/cargo#14671)
- test(build-std): download deps first (rust-lang/cargo#14861)
- test(pgo): ensure PGO works (rust-lang/cargo#14859)
- git-fetch-with-cli: Set `GIT_DIR` for bare repository compatibility (rust-lang/cargo#14860)
- fix(build-std): always link to std when testing proc-macros (rust-lang/cargo#14850)
  • Loading branch information
@bors
bors committed Nov 30, 2024
2 parents 1fc691e + 2ba7d68 commit 76f3ff6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 59 files
+1 −1 .github/workflows/main.yml
+11 −11 Cargo.lock
+3 −3 Cargo.toml
+1 −1 crates/cargo-platform/Cargo.toml
+110 −10 crates/cargo-platform/src/cfg.rs
+47 −2 crates/cargo-platform/src/lib.rs
+37 −3 crates/cargo-platform/tests/test_cfg.rs
+2 −2 crates/cargo-test-macro/Cargo.toml
+2 −2 crates/cargo-test-support/Cargo.toml
+2 −2 crates/cargo-util-schemas/Cargo.toml
+2 −2 crates/cargo-util/Cargo.toml
+2 −2 crates/crates-io/Cargo.toml
+2 −2 credential/cargo-credential-libsecret/Cargo.toml
+2 −2 credential/cargo-credential-macos-keychain/Cargo.toml
+2 −2 credential/cargo-credential-wincred/Cargo.toml
+16 −16 src/bin/cargo/commands/remove.rs
+4 −1 src/cargo/core/compiler/compilation.rs
+3 −1 src/cargo/core/compiler/custom_build.rs
+4 −4 src/cargo/ops/fix.rs
+2 −3 src/cargo/sources/git/utils.rs
+8 −1 src/cargo/util/context/target.rs
+100 −82 src/cargo/util/toml/embedded.rs
+3 −0 src/cargo/util/toml/mod.rs
+2 −0 src/cargo/util/toml_mut/dependency.rs
+91 −3 src/cargo/util/toml_mut/manifest.rs
+33 −0 tests/build-std/main.rs
+3 −0 tests/testsuite/cargo_add/mod.rs
+1 −0 tests/testsuite/cargo_add/script_bare/in/cargo-test-fixture.rs
+39 −0 tests/testsuite/cargo_add/script_bare/mod.rs
+6 −0 tests/testsuite/cargo_add/script_bare/out/cargo-test-fixture.rs
+36 −0 tests/testsuite/cargo_add/script_bare/stderr.term.svg
+7 −0 tests/testsuite/cargo_add/script_frontmatter/in/cargo-test-fixture.rs
+39 −0 tests/testsuite/cargo_add/script_frontmatter/mod.rs
+10 −0 tests/testsuite/cargo_add/script_frontmatter/out/cargo-test-fixture.rs
+31 −0 tests/testsuite/cargo_add/script_frontmatter/stderr.term.svg
+3 −0 tests/testsuite/cargo_add/script_shebang/in/cargo-test-fixture.rs
+39 −0 tests/testsuite/cargo_add/script_shebang/mod.rs
+7 −0 tests/testsuite/cargo_add/script_shebang/out/cargo-test-fixture.rs
+36 −0 tests/testsuite/cargo_add/script_shebang/stderr.term.svg
+13 −0 tests/testsuite/cargo_remove/last_dep/in/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/last_dep/in/src/lib.rs
+28 −0 tests/testsuite/cargo_remove/last_dep/mod.rs
+10 −0 tests/testsuite/cargo_remove/last_dep/out/Cargo.toml
+27 −0 tests/testsuite/cargo_remove/last_dep/stderr.term.svg
+3 −0 tests/testsuite/cargo_remove/mod.rs
+23 −0 tests/testsuite/cargo_remove/script/in/cargo-remove-test-fixture.rs
+40 −0 tests/testsuite/cargo_remove/script/mod.rs
+22 −0 tests/testsuite/cargo_remove/script/out/cargo-remove-test-fixture.rs
+32 −0 tests/testsuite/cargo_remove/script/stderr.term.svg
+7 −0 tests/testsuite/cargo_remove/script_last/in/cargo-remove-test-fixture.rs
+30 −0 tests/testsuite/cargo_remove/script_last/mod.rs
+6 −0 tests/testsuite/cargo_remove/script_last/out/cargo-remove-test-fixture.rs
+32 −0 tests/testsuite/cargo_remove/script_last/stderr.term.svg
+138 −0 tests/testsuite/cfg.rs
+1 −1 tests/testsuite/edition.rs
+59 −0 tests/testsuite/fix.rs
+1 −0 tests/testsuite/main.rs
+111 −0 tests/testsuite/pgo.rs
+1 −1 tests/testsuite/publish.rs

0 comments on commit 76f3ff6

Please sign in to comment.