Commit 5a65be8
committed
Auto merge of rust-lang#112601 - weihanglo:update-cargo, r=weihanglo
Update cargo
11 commits in 49b6d9e179a91cf7645142541c9563443f64bf2b..0c14026aa84ee2ec4c67460c0a18abc8519ca6b2
2023-06-09 17:21:19 +0000 to 2023-06-14 18:43:05 +0000
- fix(embedded): Don't append hash to bin names (rust-lang/cargo#12269)
- Fix version requirement example in Dependency Resolution, SemVer compatibility section (rust-lang/cargo#12267)
- Update triagebot links. (rust-lang/cargo#12265)
- Show a better error when container tests fail. (rust-lang/cargo#12264)
- chore: update dependencies (rust-lang/cargo#12261)
- refactor(embedded) (rust-lang/cargo#12262)
- docs: clarify the use of `default` branch instead of `main` by default (rust-lang/cargo#12251)
- docs: update changelog for 1.71 backport and 1.72 (rust-lang/cargo#12256)
- feat: Initial support for single-file packages (rust-lang/cargo#12245)
- test(z-flags): Verify `-Z` flags list is sorted (rust-lang/cargo#12224)
- refactor: registry data kinds cleanup (rust-lang/cargo#12248)
---
This commit also update LICENSE exceptions, as Cargo introduced a newer version of `dunce` and `blake3` as dependencies.
r? `@ghost`2 files changed
+5
-2
lines changed- CHANGELOG.md+39-5
- Cargo.lock+282-244
- Cargo.toml+7
- crates/cargo-test-support/src/containers.rs+3-1
- crates/cargo-test-support/src/lib.rs+3-1
- deny.toml+1
- src/bin/cargo/cli.rs+77-14
- src/bin/cargo/commands/run.rs+55-22
- src/cargo/core/features.rs+22
- src/cargo/core/package.rs+4-28
- src/cargo/core/package_id.rs+5
- src/cargo/ops/cargo_package.rs+1-1
- src/cargo/sources/registry/download.rs+5-12
- src/cargo/sources/registry/http_remote.rs+10-23
- src/cargo/sources/registry/local.rs+2-4
- src/cargo/sources/registry/mod.rs+5-6
- src/cargo/sources/registry/remote.rs+3-14
- src/cargo/util/network/mod.rs+35-4
- src/cargo/util/toml/embedded.rs+870
- src/cargo/util/toml/mod.rs+1
- src/doc/contrib/src/process/index.md+5-5
- src/doc/contrib/src/process/working-on-cargo.md+1-1
- src/doc/src/reference/resolver.md+1-1
- src/doc/src/reference/specifying-dependencies.md+2-1
- src/doc/src/reference/unstable.md+100
- tests/testsuite/main.rs+1
- tests/testsuite/script.rs+510
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
19 | 22 | | |
20 | 23 | | |
21 | 24 | | |
| |||
54 | 57 | | |
55 | 58 | | |
56 | 59 | | |
57 | | - | |
| 60 | + | |
58 | 61 | | |
59 | 62 | | |
60 | 63 | | |
| |||
0 commit comments