Skip to content

Commit

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

4 commits in 4f74d9b2a771c58b7ef4906b2668afd075bc8081..43cf77395cad5b79887b20b7cf19d418bbd703a9
2020-07-08 17:13:00 +0000 to 2020-07-13 17:35:42 +0000
- fix: add space to comments (rust-lang/cargo#8476)
- Allow configuring unstable flags via config file (rust-lang/cargo#8393)
- Add support for rustc's `-Z terminal-width`. (rust-lang/cargo#8427)
- Avoid colliding with older Cargo fingerprint changes (rust-lang/cargo#8473)
  • Loading branch information
@Manishearth
Manishearth committed Jul 14, 2020
2 parents 92e90f9 + 4c9e67a commit 1cd8c5e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 15 files
+1 −0 src/bin/cargo/cli.rs
+11 −9 src/cargo/core/compiler/context/compilation_files.rs
+22 −0 src/cargo/core/compiler/mod.rs
+2 −1 src/cargo/core/compiler/rustdoc.rs
+14 −1 src/cargo/core/features.rs
+45 −16 src/cargo/core/shell.rs
+2 −2 src/cargo/ops/cargo_new.rs
+34 −16 src/cargo/util/config/de.rs
+9 −2 src/cargo/util/config/mod.rs
+2 −2 src/cargo/util/progress.rs
+1 −1 src/cargo/util/toml/mod.rs
+44 −0 src/doc/src/reference/unstable.md
+26 −2 tests/testsuite/build.rs
+188 −4 tests/testsuite/config.rs
+3 −3 tests/testsuite/init.rs

0 comments on commit 1cd8c5e

Please sign in to comment.