Commit dca3f1b
committed
Auto merge of rust-lang#90490 - ehuss:update-cargo, r=ehuss
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)1 file changed
+1
-1
lines changed- src/bin/cargo/cli.rs+2-2
- src/cargo/core/compiler/build_config.rs+8
- src/cargo/core/compiler/build_context/mod.rs+5
- src/cargo/core/compiler/build_context/target_info.rs+4-1
- src/cargo/core/compiler/context/compilation_files.rs+14-1
- src/cargo/core/compiler/context/mod.rs+42
- src/cargo/core/compiler/mod.rs+37-1
- src/cargo/core/compiler/timings.rs+1
- src/cargo/core/compiler/unit_dependencies.rs+32-1
- src/cargo/core/features.rs+4
- src/cargo/core/profiles.rs+3-1
- src/cargo/ops/cargo_compile.rs+93-22
- src/doc/src/reference/unstable.md+17-1
- tests/testsuite/doc.rs+149
- tests/testsuite/rustdoc.rs+4
0 commit comments