Skip to content

Commit

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

6 commits in 7f08ace4f1305de7f3b1b0e2f765911957226bd4..294967c53f0c70d598fc54ca189313c86c576ea7
2021-11-24 17:54:39 +0000 to 2021-11-29 19:04:22 +0000
- Fix some tests with output collisions. (rust-lang/cargo#10137)
- Description of the targets that can be applied (rust-lang/cargo#10109)
- Improve unused patch message when source URLs mismatched (rust-lang/cargo#10130)
- Add a note about doctest xcompile. (rust-lang/cargo#10132)
- book: add edit links to specific pages (rust-lang/cargo#10124)
- Add crate type flag to rustc command (rust-lang/cargo#10093)
  • Loading branch information
@bors
bors committed Nov 30, 2021
2 parents 94bec90 + 05461d3 commit 4c94896
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 18 files
+18 −2 src/bin/cargo/commands/rustc.rs
+9 −0 src/cargo/core/compiler/build_context/mod.rs
+13 −2 src/cargo/core/compiler/mod.rs
+6 −5 src/cargo/core/registry.rs
+27 −0 src/cargo/ops/cargo_compile.rs
+1 −0 src/cargo/ops/cargo_package.rs
+10 −0 src/cargo/ops/cargo_test.rs
+87 −19 src/cargo/ops/resolve.rs
+1 −0 src/cargo/util/command_prelude.rs
+1 −0 src/doc/book.toml
+7 −0 src/doc/src/reference/profiles.md
+18 −0 src/doc/src/reference/unstable.md
+1 −1 tests/testsuite/clean.rs
+8 −0 tests/testsuite/cross_compile.rs
+18 −2 tests/testsuite/doc.rs
+6 −4 tests/testsuite/lto.rs
+92 −40 tests/testsuite/patch.rs
+222 −0 tests/testsuite/rustc.rs

0 comments on commit 4c94896

Please sign in to comment.