Skip to content

Commit

Permalink
Auto merge of rust-lang#133671 - nikic:revert-cargo-update, r=lqd
Browse files Browse the repository at this point in the history 
Revert "Auto merge of rust-lang#133654 - weihanglo:update-cargo, r=weihanglo"

This reverts commit 76f3ff6, reversing changes made to 1fc691e.

The new pgo_works test fails when rust is built without profiling support, including in CI on x86_64-gnu-aux. See rust-lang#133499 (comment) for how this happened.
  • Loading branch information
@bors
bors committed Nov 30, 2024
2 parents 76f3ff6 + f5691ba commit e48ddd8
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
+10 −110 crates/cargo-platform/src/cfg.rs
+2 −47 crates/cargo-platform/src/lib.rs
+3 −37 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
+1 −4 src/cargo/core/compiler/compilation.rs
+1 −3 src/cargo/core/compiler/custom_build.rs
+4 −4 src/cargo/ops/fix.rs
+3 −2 src/cargo/sources/git/utils.rs
+1 −8 src/cargo/util/context/target.rs
+82 −100 src/cargo/util/toml/embedded.rs
+0 −3 src/cargo/util/toml/mod.rs
+0 −2 src/cargo/util/toml_mut/dependency.rs
+3 −91 src/cargo/util/toml_mut/manifest.rs
+0 −33 tests/build-std/main.rs
+0 −3 tests/testsuite/cargo_add/mod.rs
+0 −1 tests/testsuite/cargo_add/script_bare/in/cargo-test-fixture.rs
+0 −39 tests/testsuite/cargo_add/script_bare/mod.rs
+0 −6 tests/testsuite/cargo_add/script_bare/out/cargo-test-fixture.rs
+0 −36 tests/testsuite/cargo_add/script_bare/stderr.term.svg
+0 −7 tests/testsuite/cargo_add/script_frontmatter/in/cargo-test-fixture.rs
+0 −39 tests/testsuite/cargo_add/script_frontmatter/mod.rs
+0 −10 tests/testsuite/cargo_add/script_frontmatter/out/cargo-test-fixture.rs
+0 −31 tests/testsuite/cargo_add/script_frontmatter/stderr.term.svg
+0 −3 tests/testsuite/cargo_add/script_shebang/in/cargo-test-fixture.rs
+0 −39 tests/testsuite/cargo_add/script_shebang/mod.rs
+0 −7 tests/testsuite/cargo_add/script_shebang/out/cargo-test-fixture.rs
+0 −36 tests/testsuite/cargo_add/script_shebang/stderr.term.svg
+0 −13 tests/testsuite/cargo_remove/last_dep/in/Cargo.toml
+0 −1 tests/testsuite/cargo_remove/last_dep/in/src/lib.rs
+0 −28 tests/testsuite/cargo_remove/last_dep/mod.rs
+0 −10 tests/testsuite/cargo_remove/last_dep/out/Cargo.toml
+0 −27 tests/testsuite/cargo_remove/last_dep/stderr.term.svg
+0 −3 tests/testsuite/cargo_remove/mod.rs
+0 −23 tests/testsuite/cargo_remove/script/in/cargo-remove-test-fixture.rs
+0 −40 tests/testsuite/cargo_remove/script/mod.rs
+0 −22 tests/testsuite/cargo_remove/script/out/cargo-remove-test-fixture.rs
+0 −32 tests/testsuite/cargo_remove/script/stderr.term.svg
+0 −7 tests/testsuite/cargo_remove/script_last/in/cargo-remove-test-fixture.rs
+0 −30 tests/testsuite/cargo_remove/script_last/mod.rs
+0 −6 tests/testsuite/cargo_remove/script_last/out/cargo-remove-test-fixture.rs
+0 −32 tests/testsuite/cargo_remove/script_last/stderr.term.svg
+0 −138 tests/testsuite/cfg.rs
+1 −1 tests/testsuite/edition.rs
+0 −59 tests/testsuite/fix.rs
+0 −1 tests/testsuite/main.rs
+0 −111 tests/testsuite/pgo.rs
+1 −1 tests/testsuite/publish.rs

0 comments on commit e48ddd8

Please sign in to comment.