Skip to content

Commit

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

15 commits in 40ebd52206e25c7a576ee42c137cc06a745a167a..1ec223effbbbf9fddd3453cdcae3a96a967608eb
2020-06-01 22:35:00 +0000 to 2020-06-09 20:03:14 +0000
- Default values for `readme` if not specified (rust-lang/cargo#8277)
- Fix tree completions. (rust-lang/cargo#8342)
- Support `{prefix}` and `{lowerprefix}` markers in `config.json` `dl` key (rust-lang/cargo#8267)
- Add environment variables to identify the binary and crate name (rust-lang/cargo#8270)
- Bump to 0.47.0, update changelog (rust-lang/cargo#8336)
- Nits: Remove unneeded mut and loop (rust-lang/cargo#8334)
- 1.45 beta backports (rust-lang/cargo#8331)
- Better error message when passing in relative path to Workspace::new (rust-lang/cargo#8321)
- Don't hash executable filenames on apple platforms. (rust-lang/cargo#8329)
- fix clippy warnings (rust-lang/cargo#8324)
- Require latest libgit2 to pull in bugfixes (rust-lang/cargo#8320)
- Fix an accidental raw access of field (rust-lang/cargo#8319)
- Use mem::take to replace with Default values (rust-lang/cargo#8314)
- Allow Windows dylibs without dll suffix. (rust-lang/cargo#8310)
- Show alias in help message (rust-lang/cargo#8307)
  • Loading branch information
@bors
bors committed Jun 11, 2020
2 parents ec42485 + fdeed85 commit e93cb96
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ checksum = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"

[[package]]
name = "cargo"
version = "0.46.0"
version = "0.47.0"
dependencies = [
"anyhow",
"atty",
Expand Down Expand Up @@ -1848,9 +1848,9 @@ dependencies = [

[[package]]
name = "libgit2-sys"
version = "0.12.5+1.0.0"
version = "0.12.7+1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3eadeec65514971355bf7134967a543f71372f35b53ac6c7143e7bd157f07535"
checksum = "bcd07968649bcb7b9351ecfde53ca4d27673cccfdf57c84255ec18710f3153e0"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 39 files
+148 −2 CHANGELOG.md
+2 −2 Cargo.toml
+1 −4 crates/cargo-platform/src/error.rs
+4 −4 src/bin/cargo/cli.rs
+4 −4 src/cargo/core/compiler/build_context/target_info.rs
+15 −7 src/cargo/core/compiler/compilation.rs
+8 −1 src/cargo/core/compiler/context/compilation_files.rs
+2 −2 src/cargo/core/compiler/fingerprint.rs
+3 −3 src/cargo/core/compiler/rustdoc.rs
+1 −4 src/cargo/core/compiler/unit_dependencies.rs
+1 −1 src/cargo/core/package.rs
+1 −1 src/cargo/core/registry.rs
+3 −4 src/cargo/core/resolver/resolve.rs
+1 −2 src/cargo/core/summary.rs
+11 −2 src/cargo/core/workspace.rs
+1 −1 src/cargo/lib.rs
+2 −2 src/cargo/ops/cargo_install.rs
+1 −1 src/cargo/ops/cargo_read_manifest.rs
+20 −16 src/cargo/ops/resolve.rs
+9 −3 src/cargo/sources/registry/mod.rs
+37 −3 src/cargo/sources/registry/remote.rs
+2 −4 src/cargo/util/config/mod.rs
+1 −1 src/cargo/util/flock.rs
+5 −7 src/cargo/util/process_builder.rs
+1 −5 src/cargo/util/profile.rs
+40 −6 src/cargo/util/toml/mod.rs
+1 −1 src/cargo/util/toml/targets.rs
+2 −0 src/doc/src/reference/environment-variables.md
+6 −0 src/doc/src/reference/manifest.md
+26 −3 src/doc/src/reference/registries.md
+5 −8 src/etc/_cargo
+1 −1 src/etc/cargo.bashcomp.sh
+11 −2 tests/testsuite/build.rs
+2 −2 tests/testsuite/collisions.rs
+3 −3 tests/testsuite/freshness.rs
+1 −1 tests/testsuite/main.rs
+2 −0 tests/testsuite/metadata.rs
+69 −0 tests/testsuite/proc_macro.rs
+115 −10 tests/testsuite/read_manifest.rs

0 comments on commit e93cb96

Please sign in to comment.