Skip to content

Commit

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

12 commits in 75d5d8cffe3464631f82dcd3c470b78dc1dda8bb..329895f5b52a358e5d9ecb26215708b5cb31d906
2020-12-22 18:10:56 +0000 to 2021-01-06 00:01:52 +0000
- metadata: Supply local path for path dependencies (rust-lang/cargo#8994)
- Add support for Rust edition 2021. (rust-lang/cargo#8922)
- Stabilize -Zfeatures and -Zpackage-features. (rust-lang/cargo#8997)
- Small refactor, adding a list of all kinds to BuildContext (rust-lang/cargo#9046)
- Fix git http.proxy config setting. (rust-lang/cargo#8986)
- Clarify the help text of `--aggressive` and `--precise` of `update` (rust-lang/cargo#9031)
- Assert that tests are run in the crate directory (rust-lang/cargo#9037)
- Update mdbook (rust-lang/cargo#9044)
- Bump to 0.52.0, update changelog (rust-lang/cargo#9042)
- Fix redundant semicolon. (rust-lang/cargo#9033)
- Clarify fingerprint log messages (rust-lang/cargo#9026)
- Update credential docs for gnome-secret. (rust-lang/cargo#9013)
  • Loading branch information
@bors
bors committed Jan 8, 2021
2 parents e02b0f4 + 1a2ee0b commit 92c625d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"

[[package]]
name = "cargo"
version = "0.51.0"
version = "0.52.0"
dependencies = [
"anyhow",
"atty",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 91 files
+1 −1 .github/workflows/contrib.yml
+1 −1 .github/workflows/main.yml
+59 −3 CHANGELOG.md
+1 −1 Cargo.toml
+8 −2 src/bin/cargo/commands/update.rs
+18 −1 src/cargo/core/compiler/build_context/mod.rs
+1 −3 src/cargo/core/compiler/compilation.rs
+2 −8 src/cargo/core/compiler/context/mod.rs
+25 −13 src/cargo/core/compiler/fingerprint.rs
+6 −6 src/cargo/core/compiler/unit_dependencies.rs
+6 −0 src/cargo/core/dependency.rs
+9 −7 src/cargo/core/features.rs
+5 −8 src/cargo/core/resolver/features.rs
+10 −1 src/cargo/core/source/source_id.rs
+64 −17 src/cargo/core/workspace.rs
+19 −23 src/cargo/ops/fix.rs
+2 −2 src/cargo/ops/registry.rs
+1 −15 src/cargo/util/command_prelude.rs
+1 −13 src/cargo/util/toml/mod.rs
+4 −0 src/doc/man/cargo-metadata.md
+9 −12 src/doc/man/generated_txt/cargo-bench.txt
+9 −12 src/doc/man/generated_txt/cargo-build.txt
+9 −12 src/doc/man/generated_txt/cargo-check.txt
+9 −12 src/doc/man/generated_txt/cargo-doc.txt
+9 −12 src/doc/man/generated_txt/cargo-fix.txt
+1 −1 src/doc/man/generated_txt/cargo-init.txt
+9 −12 src/doc/man/generated_txt/cargo-install.txt
+13 −12 src/doc/man/generated_txt/cargo-metadata.txt
+1 −1 src/doc/man/generated_txt/cargo-new.txt
+9 −12 src/doc/man/generated_txt/cargo-package.txt
+9 −12 src/doc/man/generated_txt/cargo-publish.txt
+9 −12 src/doc/man/generated_txt/cargo-run.txt
+9 −12 src/doc/man/generated_txt/cargo-rustc.txt
+9 −12 src/doc/man/generated_txt/cargo-rustdoc.txt
+9 −12 src/doc/man/generated_txt/cargo-test.txt
+9 −12 src/doc/man/generated_txt/cargo-tree.txt
+1 −1 src/doc/man/includes/options-new.md
+9 −12 src/doc/man/includes/section-features.md
+1 −0 src/doc/src/SUMMARY.md
+9 −12 src/doc/src/commands/cargo-bench.md
+9 −12 src/doc/src/commands/cargo-build.md
+9 −12 src/doc/src/commands/cargo-check.md
+9 −12 src/doc/src/commands/cargo-doc.md
+9 −12 src/doc/src/commands/cargo-fix.md
+1 −1 src/doc/src/commands/cargo-init.md
+9 −12 src/doc/src/commands/cargo-install.md
+13 −12 src/doc/src/commands/cargo-metadata.md
+1 −1 src/doc/src/commands/cargo-new.md
+9 −12 src/doc/src/commands/cargo-package.md
+9 −12 src/doc/src/commands/cargo-publish.md
+9 −12 src/doc/src/commands/cargo-run.md
+9 −12 src/doc/src/commands/cargo-rustc.md
+9 −12 src/doc/src/commands/cargo-rustdoc.md
+9 −12 src/doc/src/commands/cargo-test.md
+9 −12 src/doc/src/commands/cargo-tree.md
+3 −0 src/doc/src/images/winapi-features.svg
+187 −0 src/doc/src/reference/features-examples.md
+437 −95 src/doc/src/reference/features.md
+1 −0 src/doc/src/reference/index.md
+4 −3 src/doc/src/reference/manifest.md
+109 −5 src/doc/src/reference/resolver.md
+28 −0 src/doc/src/reference/semver.md
+1 −1 src/doc/src/reference/specifying-dependencies.md
+1 −135 src/doc/src/reference/unstable.md
+1 −1 src/etc/_cargo
+9 −12 src/etc/man/cargo-bench.1
+9 −12 src/etc/man/cargo-build.1
+9 −12 src/etc/man/cargo-check.1
+9 −12 src/etc/man/cargo-doc.1
+9 −12 src/etc/man/cargo-fix.1
+1 −1 src/etc/man/cargo-init.1
+9 −12 src/etc/man/cargo-install.1
+13 −12 src/etc/man/cargo-metadata.1
+1 −1 src/etc/man/cargo-new.1
+9 −12 src/etc/man/cargo-package.1
+9 −12 src/etc/man/cargo-publish.1
+9 −12 src/etc/man/cargo-run.1
+9 −12 src/etc/man/cargo-rustc.1
+9 −12 src/etc/man/cargo-rustdoc.1
+9 −12 src/etc/man/cargo-test.1
+9 −12 src/etc/man/cargo-tree.1
+0 −2 tests/testsuite/build.rs
+1 −1 tests/testsuite/cache_messages.rs
+0 −70 tests/testsuite/features.rs
+108 −245 tests/testsuite/features2.rs
+1 −0 tests/testsuite/metadata.rs
+2 −2 tests/testsuite/package.rs
+67 −83 tests/testsuite/package_features.rs
+2 −2 tests/testsuite/proc_macro.rs
+137 −0 tests/testsuite/test.rs
+69 −62 tests/testsuite/tree.rs

0 comments on commit 92c625d

Please sign in to comment.