Skip to content

Commit

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

18 commits in 3c5af6bed9a1a243a693e8e22ee2486bd5b82a6c..e84a7928d93a31f284b497c214a2ece69b4d7719 2023-01-24 15:48:15 +0000 to 2023-01-31 22:18:09 +0000

- chore: Add autolabel for `Command-*` labels (rust-lang/cargo#11664)
- Update cross test instructions for aarch64-apple-darwin (rust-lang/cargo#11663)
- Make cargo install report needed features (rust-lang/cargo#11647)
- docs(contrib): Remove out-of-date process step (rust-lang/cargo#11662)
- Do not error for `auth-required: true` without `-Z sparse-registry` (rust-lang/cargo#11661)
- Warn on commits to non-default branches. (rust-lang/cargo#11655)
- Avoid saving the same future_incompat warning multiple times (rust-lang/cargo#11648)
- Mention current default value in `publish.timeout` docs (rust-lang/cargo#11652)
- Make cargo aware of dwp files. (rust-lang/cargo#11572)
- Reduce target info rustc query calls (rust-lang/cargo#11633)
- Bump to 0.70.0; update changelog (rust-lang/cargo#11640)
- Enable sparse protocol in CI (rust-lang/cargo#11632)
- Fix split-debuginfo support detection (rust-lang/cargo#11347)
- refactor(toml): Move `TomlWorkspaceDependency` out of `TomlDependency` (rust-lang/cargo#11565)
- book: describe how the current resolver sometimes duplicates deps (rust-lang/cargo#11604)
- `cargo add` check `[dependencies]` order without considering the dotted item (rust-lang/cargo#11612)
- Link CoC to  www.rust-lang.org/conduct.html (rust-lang/cargo#11622)
- Add more labels to triagebot (rust-lang/cargo#11621)

r? `@ghost`
  • Loading branch information
@bors
bors committed Feb 1, 2023
2 parents ad8e1dc + bb2af4f commit 0d32c8f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ dependencies = [

[[package]]
name = "cargo"
version = "0.69.0"
version = "0.70.0"
dependencies = [
"anyhow",
"base64",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 31 files
+5 −0 .github/workflows/main.yml
+106 −8 CHANGELOG.md
+3 −0 CODE_OF_CONDUCT.md
+1 −1 Cargo.toml
+12 −4 crates/cargo-test-support/src/cross_compile.rs
+9 −4 crates/cargo-test-support/src/lib.rs
+72 −25 src/cargo/core/compiler/build_context/target_info.rs
+20 −6 src/cargo/core/compiler/future_incompat.rs
+11 −4 src/cargo/core/compiler/mod.rs
+6 −1 src/cargo/ops/cargo_add/mod.rs
+2 −0 src/cargo/ops/cargo_clean.rs
+49 −3 src/cargo/ops/cargo_install.rs
+11 −11 src/cargo/sources/registry/http_remote.rs
+3 −5 src/cargo/sources/registry/remote.rs
+233 −260 src/cargo/util/toml/mod.rs
+0 −4 src/doc/contrib/src/process/unstable.md
+33 −2 src/doc/src/reference/resolver.md
+13 −12 src/doc/src/reference/unstable.md
+23 −0 tests/testsuite/build.rs
+1 −0 tests/testsuite/cargo_add/mod.rs
+13 −0 tests/testsuite/cargo_add/sorted_table_with_dotted_item/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/sorted_table_with_dotted_item/in/src/lib.rs
+25 −0 tests/testsuite/cargo_add/sorted_table_with_dotted_item/mod.rs
+14 −0 tests/testsuite/cargo_add/sorted_table_with_dotted_item/out/Cargo.toml
+2 −0 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.log
+0 −0 tests/testsuite/cargo_add/sorted_table_with_dotted_item/stdout.log
+40 −0 tests/testsuite/cfg.rs
+54 −9 tests/testsuite/inheritable_workspace_fields.rs
+16 −2 tests/testsuite/registry_auth.rs
+117 −0 tests/testsuite/required_features.rs
+111 −0 triagebot.toml

0 comments on commit 0d32c8f

Please sign in to comment.