Skip to content

Commit

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

7 commits in 070e459c2d8b79c5b2ac5218064e7603329c92ae..e931e4796b61de593aa1097649445e535c9c7ee0
2021-05-11 18:12:23 +0000 to 2021-05-24 16:17:27 +0000
- Add `cargo:rustc-link-arg-bin` flag. (rust-lang/cargo#9486)
- Add a cargo-doc.browser config option (rust-lang/cargo#9473)
- Fix bug when with resolver = "1" non-virtual package was allowing unknown features (rust-lang/cargo#9437)
- Add GitHub link to contributor guide. (rust-lang/cargo#9493)
- Add temporary fix for rustup on windows in CI. (rust-lang/cargo#9498)
- 3 typos and some capitalization (rust-lang/cargo#9495)
- fix 6 typos (rust-lang/cargo#9484)
  • Loading branch information
@JohnTitor
JohnTitor committed May 26, 2021
2 parents bce257c + 8a7dc0d commit 7c0677a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 27 files
+4 −0 .github/workflows/main.yml
+22 −4 src/cargo/core/compiler/custom_build.rs
+18 −23 src/cargo/core/compiler/mod.rs
+49 −38 src/cargo/core/workspace.rs
+28 −7 src/cargo/ops/cargo_doc.rs
+3 −3 src/cargo/util/config/target.rs
+3 −0 src/doc/contrib/book.toml
+3 −1 src/doc/man/cargo-doc.md
+3 −1 src/doc/man/cargo-rustdoc.md
+3 −1 src/doc/man/generated_txt/cargo-doc.txt
+3 −1 src/doc/man/generated_txt/cargo-rustdoc.txt
+3 −1 src/doc/src/commands/cargo-doc.md
+3 −1 src/doc/src/commands/cargo-rustdoc.md
+4 −4 src/doc/src/faq.md
+1 −1 src/doc/src/guide/why-cargo-exists.md
+15 −0 src/doc/src/reference/config.md
+5 −4 src/doc/src/reference/environment-variables.md
+1 −1 src/doc/src/reference/features.md
+2 −2 src/doc/src/reference/manifest.md
+1 −1 src/doc/src/reference/overriding-dependencies.md
+1 −1 src/doc/src/reference/source-replacement.md
+16 −4 src/doc/src/reference/unstable.md
+3 −1 src/etc/man/cargo-doc.1
+3 −1 src/etc/man/cargo-rustdoc.1
+43 −0 tests/testsuite/build_script_extra_link_arg.rs
+15 −0 tests/testsuite/doc.rs
+48 −2 tests/testsuite/package_features.rs

0 comments on commit 7c0677a

Please sign in to comment.