Skip to content

Commit

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

3 commits in 6c1bc24b8b49d4bc965f67d7037906dc199c72b7..94ca096afbf25f670e76e07dca754fcfe27134be
2021-10-24 17:51:41 +0000 to 2021-10-29 14:45:06 +0000
- Chore: prefer `HashMap::from` rather than collecting `Vec` of tuples (rust-lang/cargo#10018)
- Change --scrape-examples flag to -Z rustdoc-scrape-examples (rust-lang/cargo#10017)
- Scrape code examples from examples/ directory for Rustdoc (rust-lang/cargo#9525)
  • Loading branch information
@bors
bors committed Nov 2, 2021
2 parents 6225262 + 6404dba commit dca3f1b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 15 files
+2 −2 src/bin/cargo/cli.rs
+8 −0 src/cargo/core/compiler/build_config.rs
+5 −0 src/cargo/core/compiler/build_context/mod.rs
+4 −1 src/cargo/core/compiler/build_context/target_info.rs
+14 −1 src/cargo/core/compiler/context/compilation_files.rs
+42 −0 src/cargo/core/compiler/context/mod.rs
+37 −1 src/cargo/core/compiler/mod.rs
+1 −0 src/cargo/core/compiler/timings.rs
+32 −1 src/cargo/core/compiler/unit_dependencies.rs
+4 −0 src/cargo/core/features.rs
+3 −1 src/cargo/core/profiles.rs
+93 −22 src/cargo/ops/cargo_compile.rs
+17 −1 src/doc/src/reference/unstable.md
+149 −0 tests/testsuite/doc.rs
+4 −0 tests/testsuite/rustdoc.rs

0 comments on commit dca3f1b

Please sign in to comment.