Skip to content

Commit

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

7 commits in 84dc5dc11a9007a08f27170454da6097265e510e..a8d72c675ee52dd57f0d8f2bae6655913c15b2fb
2024-05-20 18:57:08 +0000 to 2024-05-24 03:34:17 +0000
- Improve error description when deserializing partial field struct (rust-lang/cargo#13956)
- fix: remove symlink dir on Windows (rust-lang/cargo#13910)
- Fix wrong type of rustc-flags in documentation (rust-lang/cargo#13957)
- Add more high level traces (rust-lang/cargo#13951)
- upgrade gix from 0.62 to 0.63 (rust-lang/cargo#13948)
- Use `i32` rather than `usize` as "default integer" in library template (rust-lang/cargo#13939)
- fetch specific commits even if the github fast path fails (rust-lang/cargo#13946)

r? ghost
  • Loading branch information
@bors
bors committed May 25, 2024
2 parents 21e6de7 + 2d9a4c7 commit 77d4115
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 42 files
+67 −70 Cargo.lock
+1 −1 Cargo.toml
+89 −10 crates/cargo-util/src/paths.rs
+2 −0 src/cargo/core/compiler/build_context/target_info.rs
+2 −0 src/cargo/core/package.rs
+1 −1 src/cargo/ops/cargo_new.rs
+8 −0 src/cargo/sources/git/utils.rs
+23 −9 src/cargo/util/context/de.rs
+34 −2 src/cargo/util/context/mod.rs
+1 −1 src/doc/src/reference/config.md
+1 −1 tests/testsuite/cargo_init/auto_git/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/formats_source/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/fossil_autodetect/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/git_autodetect/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/ignores_failure_to_format_source/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/inherit_workspace_package_table/in/src/lib.rs
+1 −1 tests/testsuite/cargo_init/inherit_workspace_package_table/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/mercurial_autodetect/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/pijul_autodetect/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/simple_git/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/simple_git_ignore_exists/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/simple_hg/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/simple_hg_ignore_exists/out/src/lib.rs
+1 −1 tests/testsuite/cargo_init/simple_lib/out/src/lib.rs
+1 −1 tests/testsuite/cargo_new/add_members_to_non_workspace/out/bar/src/lib.rs
+1 −1 tests/testsuite/cargo_new/add_members_to_workspace_with_exclude_list/in/src/lib.rs
+1 −1 tests/testsuite/cargo_new/add_members_to_workspace_without_members/out/bar/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_lints/in/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_lints/out/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_package_table.in/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_package_table/out/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_package_table_with_edition/out/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_package_table_with_registry/out/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/in/src/lib.rs
+1 −1 tests/testsuite/cargo_new/inherit_workspace_package_table_without_version/out/src/lib.rs
+1 −1 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/src/lib.rs
+1 −1 tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/src/lib.rs
+45 −0 tests/testsuite/config.rs
+1 −1 tests/testsuite/new.rs
+4 −1 tests/testsuite/progress.rs
+1 −1 tests/testsuite/test.rs

0 comments on commit 77d4115

Please sign in to comment.