Skip to content

Commit

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

5 commits in 1ef1e0a12723ce9548d7da2b63119de9002bead8..e2e2dddebe66dfc1403a312653557e332445308b
2022-03-31 00:17:18 +0000 to 2022-04-05 17:04:53 +0000
- Part 2 of RFC2906 -- allow inheriting from a different `Cargo.toml` (rust-lang/cargo#10517)
- File Cache is valid if checkout or contents hasn't changed (rust-lang/cargo#10507)
- Fix how scrape-examples handles proc macros (rust-lang/cargo#10533)
- tools: update checkout action on CI (rust-lang/cargo#10521)
- Don't error if no binaries were installed (rust-lang/cargo#10508)
  • Loading branch information
@bors
bors committed Apr 6, 2022
2 parents 5da76ee + 43f80a6 commit ce1a813
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 13 files
+1 −1 .github/workflows/contrib.yml
+1 −1 .github/workflows/main.yml
+0 −5 src/cargo/core/compiler/unit_dependencies.rs
+9 −0 src/cargo/core/manifest.rs
+2 −1 src/cargo/core/mod.rs
+114 −41 src/cargo/core/workspace.rs
+4 −0 src/cargo/ops/cargo_compile.rs
+49 −9 src/cargo/ops/cargo_install.rs
+27 −6 src/cargo/sources/registry/remote.rs
+112 −36 src/cargo/util/toml/mod.rs
+33 −0 tests/testsuite/doc.rs
+523 −28 tests/testsuite/inheritable_workspace_fields.rs
+66 −6 tests/testsuite/required_features.rs

0 comments on commit ce1a813

Please sign in to comment.