Commit 4457658
committed
Auto merge of rust-lang#112859 - weihanglo:update-cargo, r=weihanglo
Update cargo
12 commits in 0c14026aa84ee2ec4c67460c0a18abc8519ca6b2..dead4b8740c4b6a8ed5211e37c99cf81d01c3b1c
2023-06-14 18:43:05 +0000 to 2023-06-20 20:07:17 +0000
- Convert valid feature name warning to an error. (rust-lang/cargo#12291)
- fix(embedded): Don't pollute script dir with lockfile (rust-lang/cargo#12284)
- fix: remove `-Zjobserver-per-rustc` again (rust-lang/cargo#12285)
- docs: some tweaks around `cargo test` (rust-lang/cargo#12288)
- Enable `doctest-in-workspace` by default (rust-lang/cargo#12221)
- fix(embedded): Don't auto-discover build.rs files (rust-lang/cargo#12283)
- fix(embeded): Don't pollute the scripts dir with `target/` (rust-lang/cargo#12282)
- feat: prepare for the next lockfile bump (rust-lang/cargo#12279)
- fix(embedded): Don't create an intermediate manifest (rust-lang/cargo#12268)
- refactor(embedded): Switch to `syn` for parsing doc comments (rust-lang/cargo#12258)
- fix(embedded): Align package name sanitization with cargo-new (rust-lang/cargo#12255)
- Clarify the default behavior of cargo-install. (rust-lang/cargo#12276)
r? `@ghost`2 files changed
+1
-4
lines changed- Cargo.lock+1-35
- Cargo.toml-4
- crates/resolver-tests/src/lib.rs-4
- deny.toml-1
- src/bin/cargo/commands/run.rs+12-6
- src/cargo/core/features.rs+6-4
- src/cargo/core/manifest.rs+6
- src/cargo/core/resolver/encode.rs+9
- src/cargo/core/resolver/resolve.rs+4
- src/cargo/core/resolver/version_prefs.rs-3
- src/cargo/core/summary.rs+48-20
- src/cargo/core/workspace.rs+27-1
- src/cargo/ops/cargo_new.rs+1
- src/cargo/ops/cargo_package.rs+1-1
- src/cargo/ops/cargo_test.rs+3-8
- src/cargo/ops/lockfile.rs+32-11
- src/cargo/sources/registry/index.rs+12-20
- src/cargo/util/restricted_names.rs+24
- src/cargo/util/toml/embedded.rs+382-357
- src/cargo/util/toml/mod.rs+24-5
- src/doc/man/cargo-install.md+2-2
- src/doc/man/cargo-test.md+10-3
- src/doc/man/generated_txt/cargo-install.txt+3-2
- src/doc/man/generated_txt/cargo-test.txt+12-5
- src/doc/src/commands/cargo-install.md+2-2
- src/doc/src/commands/cargo-test.md+10-3
- src/doc/src/reference/unstable.md+8-19
- src/etc/man/cargo-install.1+2-2
- src/etc/man/cargo-test.1+10-3
- tests/testsuite/build_script.rs+1-1
- tests/testsuite/doc.rs+93-4
- tests/testsuite/features.rs+42-57
- tests/testsuite/lockfile_compat.rs+63
- tests/testsuite/script.rs+149-36
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | 19 | | |
23 | 20 | | |
24 | 21 | | |
| |||
0 commit comments