Skip to content

Commit

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

10 commits in 1ae631085f01c1a72d05df1ec81f3759a8360042..7bb7b539558dc88bea44cee4168b6269bf8177b0
2024-01-17 17:26:41 +0000 to 2024-01-20 00:15:32 +0000
- feat: inherit jobserver from env for all kinds of runner (rust-lang/cargo#12776)
- Fix static_mut_ref warning. (rust-lang/cargo#13329)
- fix(trim-paths): remap common prefix only (rust-lang/cargo#13210)
- fix(cargo-rustdoc): use same path by output format logic everywhere (rust-lang/cargo#13325)
- chore: Make MSRV=N-2 the workspace default (rust-lang/cargo#13324)
- Fix precise-prerelease tracking link. (rust-lang/cargo#13320)
- test(pkgid): keep package ID format in sync (rust-lang/cargo#13322)
- Improve GitHub Actions CI config (rust-lang/cargo#13317)
- Go back to passing an empty `values()` when no features are declared (rust-lang/cargo#13316)
- fix(`--package`): accept `?` if it's a valid pkgid spec (rust-lang/cargo#13315)

r? ghost
  • Loading branch information
@bors
bors committed Jan 24, 2024
2 parents 0b77301 + d616bb1 commit f6ee4bf
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 36 files
+12 −4 .github/workflows/main.yml
+3 −3 Cargo.lock
+2 −2 Cargo.toml
+0 −1 benches/benchsuite/Cargo.toml
+0 −1 benches/capture/Cargo.toml
+1 −1 crates/cargo-platform/Cargo.toml
+0 −1 crates/cargo-test-macro/Cargo.toml
+2 −2 crates/cargo-test-macro/src/lib.rs
+0 −1 crates/cargo-test-support/Cargo.toml
+1 −1 crates/cargo-util-schemas/Cargo.toml
+1 −1 crates/cargo-util/Cargo.toml
+1 −1 crates/crates-io/Cargo.toml
+1 −1 crates/home/Cargo.toml
+0 −1 crates/mdman/Cargo.toml
+0 −1 crates/resolver-tests/Cargo.toml
+1 −1 crates/rustfix/Cargo.toml
+0 −1 crates/semver-check/Cargo.toml
+0 −1 crates/xtask-build-man/Cargo.toml
+0 −1 crates/xtask-bump-check/Cargo.toml
+0 −1 crates/xtask-stale-label/Cargo.toml
+1 −1 credential/cargo-credential-1password/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
+1 −1 credential/cargo-credential/Cargo.toml
+7 −1 src/cargo/core/compiler/compilation.rs
+26 −29 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/ops/cargo_compile/packages.rs
+22 −14 src/cargo/ops/cargo_doc.rs
+1 −1 src/doc/src/reference/unstable.md
+41 −0 tests/testsuite/check.rs
+7 −7 tests/testsuite/check_cfg.rs
+149 −18 tests/testsuite/jobserver.rs
+143 −0 tests/testsuite/pkgid.rs
+10 −11 tests/testsuite/profile_trim_paths.rs
+1 −0 tests/testsuite/rustdoc.rs

0 comments on commit f6ee4bf

Please sign in to comment.