Skip to content

Commit

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

13 commits in 9787229614b27854cf73d57ffae430d7c1e6caa4..66ad359b408ccdf867cceb30cc2dff1ed4afd82d
2023-12-06 02:29:23 +0000 to 2023-12-09 12:30:01 +0000
- chore: downgrade to openssl v1.1.1 (rust-lang/cargo#13144)
- fix: explicitly remap current dir by using `.` (rust-lang/cargo#13114)
- Don't rely on mtime to test changes (rust-lang/cargo#13143)
- refactor: Pull PackageIdSpec into schema (rust-lang/cargo#13128)
- fix: Print rustc messages colored on wincon (rust-lang/cargo#13140)
- Add a windows manifest file (rust-lang/cargo#13131)
- Avoid writing CACHEDIR.TAG if it already exists (rust-lang/cargo#13132)
- re-enable flaky tests thanks to update to `gix-config`. (rust-lang/cargo#11821) (rust-lang/cargo#13130)
- fix bash completion in directory with spaces (rust-lang/cargo#13126)
- test: re-ignore git auth tests for gitoxide (rust-lang/cargo#13129)
- fix(toml): Disallow inheriting of dependency public status (rust-lang/cargo#13125)
- re-enable previously disabled tests with Windows-specific fix (rust-lang/cargo#13117)
- refactor: Clarify PackageId constructor names (rust-lang/cargo#13123)
  • Loading branch information
@bors
bors committed Dec 9, 2023
2 parents 08587a5 + 400e437 commit a01b2d4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 45 files
+372 −371 Cargo.lock
+2 −2 Cargo.toml
+24 −0 build.rs
+8 −5 crates/cargo-util/src/paths.rs
+4 −4 crates/resolver-tests/src/lib.rs
+1 −0 src/bin/cargo/commands/remove.rs
+1 −1 src/cargo/core/compiler/mod.rs
+3 −2 src/cargo/core/mod.rs
+23 −12 src/cargo/core/package_id.rs
+41 −600 src/cargo/core/package_id_spec.rs
+3 −1 src/cargo/core/profiles.rs
+3 −1 src/cargo/core/resolver/dep_cache.rs
+2 −2 src/cargo/core/resolver/encode.rs
+1 −1 src/cargo/core/resolver/resolve.rs
+1 −1 src/cargo/core/resolver/version_prefs.rs
+2 −201 src/cargo/core/source_id.rs
+1 −1 src/cargo/core/summary.rs
+3 −1 src/cargo/core/workspace.rs
+1 −1 src/cargo/ops/cargo_clean.rs
+5 −5 src/cargo/ops/cargo_compile/packages.rs
+1 −1 src/cargo/ops/cargo_generate_lockfile.rs
+2 −4 src/cargo/ops/cargo_install.rs
+2 −2 src/cargo/ops/cargo_pkgid.rs
+1 −1 src/cargo/ops/cargo_uninstall.rs
+1 −1 src/cargo/ops/common_for_install_and_uninstall.rs
+1 −0 src/cargo/ops/registry/publish.rs
+3 −1 src/cargo/ops/resolve.rs
+1 −1 src/cargo/ops/tree/mod.rs
+1 −1 src/cargo/sources/registry/index.rs
+5 −10 src/cargo/util/toml/mod.rs
+6 −0 src/cargo/util_schemas/core/mod.rs
+601 −0 src/cargo/util_schemas/core/package_id_spec.rs
+201 −0 src/cargo/util_schemas/core/source_kind.rs
+8 −1 src/cargo/util_schemas/manifest.rs
+1 −0 src/cargo/util_schemas/mod.rs
+3 −0 src/doc/src/reference/unstable.md
+2 −2 src/etc/cargo.bashcomp.sh
+2 −2 tests/testsuite/build_script.rs
+1 −1 tests/testsuite/build_script_env.rs
+1 −1 tests/testsuite/freshness.rs
+0 −10 tests/testsuite/git_auth.rs
+2 −2 tests/testsuite/profile_config.rs
+96 −58 tests/testsuite/profile_trim_paths.rs
+10 −1 tests/testsuite/pub_priv.rs
+28 −0 windows.manifest.xml

0 comments on commit a01b2d4

Please sign in to comment.