Skip to content

Commit

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

7 commits in c994a4a638370bc7e0ffcbb0e2865afdfa7d4415..2381cbdb4e9b07090f552d34a44a529b6e620e44 2022-12-18 21:50:58 +0000 to 2022-12-23 12:19:27 +0000

- fix: deduplicate dependencies by artifact target (rust-lang/cargo#11478)
- Add warning if potentially-scrapable examples are skipped due to dev-dependencies (rust-lang/cargo#11503)
- Don't scrape examples from library targets by default (rust-lang/cargo#11499)
- Stabilize terminal-width (rust-lang/cargo#11494)
- Make sure that hash of `SourceId` is stable (rust-lang/cargo#11501)
- Use workspace lockfile when running `cargo package` and `cargo publish` (rust-lang/cargo#11477)
- Show `--help` if there is no man page for subcommand (rust-lang/cargo#11473)

r? `@ghost`
  • Loading branch information
@bors
bors committed Dec 23, 2022
2 parents af3e06f + 5d3c22d commit 2c3f284
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 18 files
+0 −1 src/bin/cargo/commands/config.rs
+15 −5 src/bin/cargo/commands/help.rs
+14 −1 src/bin/cargo/main.rs
+3 −17 src/cargo/core/compiler/mod.rs
+1 −0 src/cargo/core/compiler/standard_lib.rs
+16 −2 src/cargo/core/compiler/unit.rs
+5 −0 src/cargo/core/compiler/unit_dependencies.rs
+4 −12 src/cargo/core/features.rs
+5 −2 src/cargo/core/shell.rs
+81 −26 src/cargo/core/source/source_id.rs
+31 −30 src/cargo/ops/cargo_compile/mod.rs
+59 −22 src/cargo/ops/cargo_compile/unit_generator.rs
+13 −1 src/cargo/ops/cargo_package.rs
+19 −50 src/doc/src/reference/unstable.md
+407 −0 tests/testsuite/artifact_dep.rs
+10 −5 tests/testsuite/build.rs
+48 −63 tests/testsuite/docscrape.rs
+98 −0 tests/testsuite/publish_lockfile.rs

0 comments on commit 2c3f284

Please sign in to comment.