Skip to content

Commit

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

15 commits in 257b72b8adfb1f2aa9916cefca67285c21666276..fa646583675d7c140482bd906145c71b7fb4fc2b
2024-07-30 15:08:27 +0000 to 2024-08-02 16:08:06 +0000
- refactor(toml): Rename 'resolved' to 'normalized' (rust-lang/cargo#14342)
- faq: rephrase offline usage. (rust-lang/cargo#14336)
- docs(unstable): Improve nightly link (rust-lang/cargo#14344)
- Fix a typo in 1.81 changes (rust-lang/cargo#14343)
- Change tests to support `rustc` wording changes (rust-lang/cargo#14341)
- chore(deps): update rust crate windows-sys to 0.59 (rust-lang/cargo#14335)
- chore(deps): update rust crate gix to 0.64.0 (rust-lang/cargo#14332)
- chore(deps): update compatible (rust-lang/cargo#14331)
- chore(deps): update rust crate rusqlite to 0.32.0 (rust-lang/cargo#14334)
- fix: also build manpage for cargo.md (rust-lang/cargo#14339)
- fix(config): Adjust MSRV resolve config field name / values (rust-lang/cargo#14296)
- fix(toml): Resolve regression from toml_edit 0.22.18 (rust-lang/cargo#14329)
- test(publish): More dev-dep stripping cases (rust-lang/cargo#14327)
- Use gmake on AIX (rust-lang/cargo#14323)
- fix(publish): Don't strip non-dev features (rust-lang/cargo#14325)

r? ghost
  • Loading branch information
@bors
bors committed Aug 3, 2024
2 parents 1df0458 + 05111c9 commit eefd2ea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 40 files
+1 −1 CHANGELOG.md
+108 −100 Cargo.lock
+6 −6 Cargo.toml
+1 −1 crates/cargo-util-schemas/Cargo.toml
+47 −38 crates/cargo-util-schemas/src/manifest/mod.rs
+6 −1 crates/home/src/windows.rs
+2 −2 crates/xtask-build-man/src/main.rs
+1 −1 src/cargo/core/compiler/fingerprint/mod.rs
+1 −1 src/cargo/core/compiler/mod.rs
+15 −15 src/cargo/core/manifest.rs
+1 −1 src/cargo/core/shell.rs
+6 −6 src/cargo/core/workspace.rs
+10 −5 src/cargo/ops/cargo_package.rs
+2 −2 src/cargo/ops/fix.rs
+24 −38 src/cargo/ops/registry/publish.rs
+1 −1 src/cargo/ops/vendor.rs
+5 −5 src/cargo/sources/path.rs
+4 −4 src/cargo/util/context/mod.rs
+2 −2 src/cargo/util/lints.rs
+189 −172 src/cargo/util/toml/mod.rs
+31 −31 src/cargo/util/toml/targets.rs
+6 −0 src/doc/man/cargo.md
+21 −9 src/doc/man/generated_txt/cargo.txt
+18 −12 src/doc/src/commands/cargo.md
+13 −38 src/doc/src/faq.md
+13 −11 src/doc/src/reference/unstable.md
+26 −8 src/etc/man/cargo.1
+1 −4 tests/testsuite/cargo_add/rust_version_ignore/mod.rs
+1 −4 tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
+1 −4 tests/testsuite/cargo_add/rust_version_latest/mod.rs
+1 −4 tests/testsuite/cargo_add/rust_version_older/mod.rs
+1 −4 tests/testsuite/cargo_add/rustc_ignore/mod.rs
+1 −4 tests/testsuite/cargo_add/rustc_incompatible/mod.rs
+1 −4 tests/testsuite/cargo_add/rustc_latest/mod.rs
+1 −4 tests/testsuite/cargo_add/rustc_older/mod.rs
+1 −1 tests/testsuite/check.rs
+2 −2 tests/testsuite/inheritable_workspace_fields.rs
+2 −0 tests/testsuite/jobserver.rs
+121 −103 tests/testsuite/publish.rs
+20 −71 tests/testsuite/rust_version.rs

0 comments on commit eefd2ea

Please sign in to comment.