Skip to content

Commit

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

9 commits in 9233aa06c801801cff75df65df718d70905a235e..4952979031e2cf1d901c817a32e25a156a19db4c
2021-06-22 21:32:55 +0000 to 2021-07-01 01:14:50 +0000
- Fix `BorrowMutError` when calling `cargo doc --open` (rust-lang/cargo#9531)
- Exclude `target` from content-indexing on Windows (rust-lang/cargo#9635)
- Temporarily ignore 2021 edition fix. (rust-lang/cargo#9642)
- Temporarily disable future_incompat tests. (rust-lang/cargo#9638)
- Include toolchain specification in error message (rust-lang/cargo#9625)
- Error when packaging with git dependencies without version (rust-lang/cargo#9612)
- simply 'if' block (rust-lang/cargo#9615)
- tidy some closures and iterators (rust-lang/cargo#9614)
- use 'writeln' instead of appending newline character (rust-lang/cargo#9620)
  • Loading branch information
@bors
bors committed Jul 1, 2021
2 parents 3cb1c11 + 60608e5 commit 64de497
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 17 files
+30 −0 crates/cargo-util/src/paths.rs
+1 −1 src/cargo/core/compiler/custom_build.rs
+1 −6 src/cargo/core/compiler/fingerprint.rs
+1 −2 src/cargo/core/compiler/job_queue.rs
+9 −1 src/cargo/core/compiler/standard_lib.rs
+1 −1 src/cargo/core/compiler/timings.rs
+2 −4 src/cargo/core/dependency.rs
+1 −1 src/cargo/ops/cargo_compile.rs
+6 −15 src/cargo/ops/cargo_doc.rs
+4 −16 src/cargo/ops/cargo_package.rs
+32 −0 src/cargo/ops/mod.rs
+4 −26 src/cargo/ops/registry.rs
+35 −0 tests/testsuite/doc.rs
+1 −0 tests/testsuite/fix.rs
+5 −0 tests/testsuite/future_incompat_report.rs
+45 −4 tests/testsuite/package.rs
+2 −2 tests/testsuite/weak_dep_features.rs

0 comments on commit 64de497

Please sign in to comment.