Skip to content

Commit

Permalink
Rollup merge of rust-lang#137597 - oli-obk:push-unkusxkoqrus, r=Kobzol
Browse files Browse the repository at this point in the history 
Revert accidental cargo submodule update

This was accidentally introduced in rust-lang#135726
  • Loading branch information
@fmease
fmease authored Feb 25, 2025
2 parents e6bd9e6 + 6cd0721 commit fb9ae4c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 45 files
+26 −0 .github/renovate.json5
+1 −1 .github/workflows/main.yml
+9 −9 Cargo.lock
+10 −10 Cargo.toml
+4 −1 ci/validate-version-bump.sh
+2 −2 crates/cargo-test-macro/Cargo.toml
+2 −2 crates/cargo-test-support/Cargo.toml
+0 −2 crates/cargo-test-support/src/paths.rs
+2 −2 crates/cargo-util-schemas/Cargo.toml
+2 −2 crates/cargo-util/Cargo.toml
+1 −1 crates/cargo-util/src/process_builder.rs
+6 −0 crates/cargo-util/src/registry.rs
+2 −2 crates/crates-io/Cargo.toml
+33 −14 crates/xtask-bump-check/src/xtask.rs
+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
+1 −1 src/cargo/core/resolver/types.rs
+38 −29 src/cargo/ops/cargo_add/mod.rs
+2 −1 src/cargo/ops/cargo_package/mod.rs
+7 −7 src/cargo/ops/fix.rs
+6 −6 src/cargo/sources/registry/index/mod.rs
+118 −33 src/cargo/util/toml/embedded.rs
+1 −1 src/doc/man/cargo-publish.md
+6 −9 src/doc/man/generated_txt/cargo-publish.txt
+150 −5 src/doc/src/CHANGELOG.md
+6 −7 src/doc/src/commands/cargo-publish.md
+26 −0 src/doc/src/reference/unstable.md
+1 −1 src/doc/src/reference/workspaces.md
+5 −4 src/etc/man/cargo-publish.1
+51 −0 tests/testsuite/cargo_add/features_error_activated_over_limit/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/features_error_activated_over_limit/in/src/lib.rs
+35 −0 tests/testsuite/cargo_add/features_error_activated_over_limit/mod.rs
+51 −0 tests/testsuite/cargo_add/features_error_activated_over_limit/out/Cargo.toml
+40 −0 tests/testsuite/cargo_add/features_error_activated_over_limit/stderr.term.svg
+12 −0 tests/testsuite/cargo_add/features_error_deactivated_over_limit/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/features_error_deactivated_over_limit/in/src/lib.rs
+35 −0 tests/testsuite/cargo_add/features_error_deactivated_over_limit/mod.rs
+12 −0 tests/testsuite/cargo_add/features_error_deactivated_over_limit/out/Cargo.toml
+36 −0 tests/testsuite/cargo_add/features_error_deactivated_over_limit/stderr.term.svg
+2 −0 tests/testsuite/cargo_add/mod.rs
+1 −1 tests/testsuite/features2.rs
+2 −14 tests/testsuite/global_cache_tracker.rs
+62 −0 tests/testsuite/package.rs
+1 −1 tests/testsuite/workspaces.rs

0 comments on commit fb9ae4c

Please sign in to comment.