Commit d304f5c
committed
Auto merge of rust-lang#65186 - mati865:cargoup, r=alexcrichton
Update Cargo
To pull rust-lang/cargo#7482
List of merged PRs:
- Fix wrong directories in PATH on Windows (rust-lang/cargo#7482)
- Update SPDX list to 3.6 (rust-lang/cargo#7481)
- Mark Emscripten's .wasm files auxiliary (rust-lang/cargo#7476)
- Update `curl-sys` dependency requirement (rust-lang/cargo#7464)
- add dependencies for `pkg-config` (rust-lang/cargo#7443)
- Removing hash from output files when using MSVC (rust-lang/cargo#7400)
- Disable preserving mtimes on archives (rust-lang/cargo#7465)
- Removed redundant borrow (rust-lang/cargo#7462)
- Public dependency refactor and re-allow backjumping (rust-lang/cargo#7361)
- unify the quote in Cargo.toml (rust-lang/cargo#7461)1 file changed
+1
-1
lines changed- Cargo.toml+6-6
- README.md+1
- crates/resolver-tests/tests/resolve.rs+35
- src/cargo/core/compiler/build_context/target_info.rs+25-22
- src/cargo/core/compiler/compilation.rs+2-2
- src/cargo/core/compiler/context/compilation_files.rs+2-1
- src/cargo/core/compiler/context/mod.rs+2-1
- src/cargo/core/resolver/conflict_cache.rs+2-2
- src/cargo/core/resolver/context.rs+213-21
- src/cargo/core/resolver/mod.rs+27-87
- src/cargo/core/resolver/types.rs+12-1
- src/cargo/ops/cargo_install.rs+3-3
- src/cargo/sources/registry/mod.rs+1
- src/doc/src/reference/manifest.md+4-4
- tests/testsuite/build.rs+1-2
- tests/testsuite/collisions.rs+5-1
- tests/testsuite/freshness.rs+1
0 commit comments