Skip to content

Commit

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

9 commits in cb06cb2696df2567ce06d1a39b1b40612a29f853..500b2bd01c958f5a33b6aa3f080bea015877b83c
2020-05-08 21:57:44 +0000 to 2020-05-18 17:12:54 +0000
- Handle LTO with an rlib/cdylib crate type (rust-lang/cargo#8254)
- Gracefully handle errors during a build. (rust-lang/cargo#8247)
- Update `im-rc` to 15.0.0 (rust-lang/cargo#8255)
- Fix `cargo update` with unused patch. (rust-lang/cargo#8243)
- Rephrased error message for disallowed sections in virtual workspace (rust-lang/cargo#8200)
- Ignore broken console output in some situations. (rust-lang/cargo#8236)
- Expand error message to explain that a string was found (rust-lang/cargo#8235)
- Add context to some fs errors. (rust-lang/cargo#8232)
- Move SipHasher to an isolated module. (rust-lang/cargo#8233)
  • Loading branch information
@bors
bors committed May 20, 2020
2 parents 3a7dfda + c8443bb commit 692a26e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1625,9 +1625,9 @@ dependencies = [

[[package]]
name = "im-rc"
version = "14.0.0"
version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9ad726dce25993be6352b0bff048e4d2647440c0a673d32257c4fac49356d18"
checksum = "3ca8957e71f04a205cb162508f9326aea04676c8dfd0711220190d6b83664f3f"
dependencies = [
"bitmaps",
"rand_core 0.5.1",
Expand Down Expand Up @@ -4721,9 +4721,9 @@ checksum = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"

[[package]]
name = "sized-chunks"
version = "0.5.0"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62db64dd92b3b54314b1e216c274634ca2b3fe8da8b3873be670cb1ac4dad30f"
checksum = "1ec31ceca5644fa6d444cc77548b88b67f46db6f7c71683b0f9336e671830d2f"
dependencies = [
"bitmaps",
"typenum",
Expand Down Expand Up @@ -5415,9 +5415,9 @@ dependencies = [

[[package]]
name = "typenum"
version = "1.10.0"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"

[[package]]
name = "ucd-parse"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 54 files
+1 −1 Cargo.toml
+12 −9 src/bin/cargo/cli.rs
+1 −3 src/bin/cargo/commands/locate_project.rs
+1 −3 src/bin/cargo/commands/metadata.rs
+1 −1 src/bin/cargo/commands/pkgid.rs
+1 −3 src/bin/cargo/commands/read_manifest.rs
+1 −1 src/bin/cargo/commands/tree.rs
+4 −10 src/bin/cargo/commands/verify_project.rs
+3 −4 src/bin/cargo/commands/version.rs
+3 −3 src/cargo/core/compiler/build_plan.rs
+4 −4 src/cargo/core/compiler/context/compilation_files.rs
+1 −2 src/cargo/core/compiler/context/mod.rs
+70 −34 src/cargo/core/compiler/job_queue.rs
+40 −26 src/cargo/core/compiler/lto.rs
+4 −4 src/cargo/core/compiler/mod.rs
+1 −2 src/cargo/core/compiler/output_depinfo.rs
+21 −7 src/cargo/core/compiler/timings.rs
+1 −1 src/cargo/core/compiler/unit_graph.rs
+1 −12 src/cargo/core/manifest.rs
+6 −2 src/cargo/core/resolver/features.rs
+1 −1 src/cargo/core/resolver/mod.rs
+81 −54 src/cargo/core/shell.rs
+0 −6 src/cargo/lib.rs
+7 −1 src/cargo/ops/cargo_generate_lockfile.rs
+4 −6 src/cargo/ops/cargo_install.rs
+4 −5 src/cargo/ops/cargo_new.rs
+2 −2 src/cargo/ops/cargo_package.rs
+9 −6 src/cargo/ops/fix.rs
+16 −9 src/cargo/ops/registry.rs
+21 −10 src/cargo/ops/tree/mod.rs
+12 −10 src/cargo/ops/vendor.rs
+1 −2 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/sources/registry/local.rs
+2 −1 src/cargo/sources/registry/mod.rs
+3 −2 src/cargo/sources/registry/remote.rs
+46 −2 src/cargo/util/config/mod.rs
+1 −2 src/cargo/util/flock.rs
+6 −6 src/cargo/util/graph.rs
+24 −0 src/cargo/util/hasher.rs
+4 −5 src/cargo/util/hex.rs
+2 −0 src/cargo/util/mod.rs
+26 −2 src/cargo/util/paths.rs
+4 −6 src/cargo/util/rustc.rs
+2 −2 src/cargo/util/sha256.rs
+14 −14 src/cargo/util/toml/mod.rs
+93 −0 tests/internal.rs
+113 −2 tests/testsuite/build.rs
+23 −0 tests/testsuite/cargo_command.rs
+2 −2 tests/testsuite/config.rs
+75 −0 tests/testsuite/lto.rs
+12 −1 tests/testsuite/owner.rs
+76 −0 tests/testsuite/patch.rs
+49 −8 tests/testsuite/search.rs
+1 −1 tests/testsuite/workspaces.rs

0 comments on commit 692a26e

Please sign in to comment.