Skip to content

Commit

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

7 commits in 708383d620e183a9ece69b8fe930c411d83dee27..b4d18d4bd3db6d872892f6c87c51a02999b80802
2023-10-27 21:09:26 +0000 to 2023-10-31 18:19:10 +0000
- refactor(toml): Cleanup noticed on the way to rust-lang/cargo#12801 (rust-lang/cargo#12902)
- feat(trim-paths): set env `CARGO_TRIM_PATHS` for build scripts (rust-lang/cargo#12900)
- feat: implement RFC 3127 `-Ztrim-paths` (rust-lang/cargo#12625)
- docs: clarify config to use vendored source is printed to stdout (rust-lang/cargo#12893)
- Improve the margin calculation for the search command's UI (rust-lang/cargo#12890)
- Add new packages to [workspace.members] automatically (rust-lang/cargo#12779)
- refactor(toml): Decouple parsing from interning system (rust-lang/cargo#12881)

r? ghost
  • Loading branch information
@bors
bors committed Oct 31, 2023
2 parents 50be229 + 7ea6977 commit 9d83ac2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 84 files
+6 −6 Cargo.lock
+1 −1 Cargo.toml
+1 −1 src/bin/cargo/commands/remove.rs
+4 −0 src/cargo/core/compiler/custom_build.rs
+74 −0 src/cargo/core/compiler/mod.rs
+5 −0 src/cargo/core/features.rs
+22 −24 src/cargo/core/package_id_spec.rs
+47 −21 src/cargo/core/profiles.rs
+1 −1 src/cargo/core/workspace.rs
+1 −16 src/cargo/ops/cargo_add/mod.rs
+104 −3 src/cargo/ops/cargo_new.rs
+2 −8 src/cargo/ops/registry/search.rs
+14 −0 src/cargo/util/rustc.rs
+172 −38 src/cargo/util/toml/mod.rs
+16 −0 src/cargo/util/toml_mut/mod.rs
+8 −2 src/doc/man/cargo-vendor.md
+8 −3 src/doc/man/generated_txt/cargo-vendor.txt
+8 −2 src/doc/src/commands/cargo-vendor.md
+97 −0 src/doc/src/reference/unstable.md
+14 −2 src/etc/man/cargo-vendor.1
+34 −0 tests/testsuite/bad_config.rs
+1 −0 tests/testsuite/cargo_init/mod.rs
+2 −0 tests/testsuite/cargo_init/workspace_add_member/in/Cargo.toml
+0 −0 tests/testsuite/cargo_init/workspace_add_member/in/crates/foo/.keep
+21 −0 tests/testsuite/cargo_init/workspace_add_member/mod.rs
+3 −0 tests/testsuite/cargo_init/workspace_add_member/out/Cargo.toml
+8 −0 tests/testsuite/cargo_init/workspace_add_member/out/crates/foo/Cargo.toml
+3 −0 tests/testsuite/cargo_init/workspace_add_member/out/crates/foo/src/main.rs
+1 −0 tests/testsuite/cargo_init/workspace_add_member/stderr.log
+0 −0 tests/testsuite/cargo_init/workspace_add_member/stdout.log
+5 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/in/Cargo.toml
+22 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/mod.rs
+6 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/out/Cargo.toml
+9 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/out/crates/foo/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/out/crates/foo/src/main.rs
+1 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stderr.log
+0 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_previous_items/stdout.log
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/in/Cargo.toml
+8 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/in/crates/bar/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/in/crates/bar/src/main.rs
+8 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/in/crates/qux/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/in/crates/qux/src/main.rs
+22 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/mod.rs
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/out/Cargo.toml
+8 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/out/crates/foo/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/out/crates/foo/src/main.rs
+1 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stderr.log
+0 −0 tests/testsuite/cargo_new/add_members_to_workspace_format_sorted/stdout.log
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/in/Cargo.toml
+23 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/mod.rs
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/out/Cargo.toml
+8 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/out/crates/foo/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/out/crates/foo/src/main.rs
+1 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stderr.log
+0 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_absolute_package_path/stdout.log
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/in/Cargo.toml
+22 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/mod.rs
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/out/Cargo.toml
+8 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/out/crates/foo/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/out/crates/foo/src/main.rs
+1 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stderr.log
+0 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_empty_members/stdout.log
+4 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/in/Cargo.toml
+14 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/in/src/lib.rs
+22 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/mod.rs
+4 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/out/Cargo.toml
+8 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/out/crates/foo/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/out/crates/foo/src/main.rs
+1 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stderr.log
+0 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/stdout.log
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/in/Cargo.toml
+22 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/mod.rs
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/out/Cargo.toml
+8 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/out/crates/foo/Cargo.toml
+3 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/out/crates/foo/src/main.rs
+1 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stderr.log
+0 −0 tests/testsuite/cargo_new/add_members_to_workspace_with_members_glob/stdout.log
+6 −0 tests/testsuite/cargo_new/mod.rs
+2 −0 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/Cargo.toml
+0 −8 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log
+68 −6 tests/testsuite/config.rs
+1 −0 tests/testsuite/main.rs
+579 −0 tests/testsuite/profile_trim_paths.rs
+2 −15 tests/testsuite/workspaces.rs

0 comments on commit 9d83ac2

Please sign in to comment.