Skip to content

Commit

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

12 commits in beb8fcb5248dc2e6aa488af9613216d5ccb31c6a..759b6161a328db1d4863139e90875308ecd25a75
2019-04-30 23:58:00 +0000 to 2019-05-06 20:47:49 +0000
- Small things (rust-lang/cargo#6910)
- Fix skipping over invalid registry packages (rust-lang/cargo#6912)
- Fixes rust-lang/cargo#6874 (rust-lang/cargo#6905)
- doc: Format examples of version to ease reading (rust-lang/cargo#6907)
- fix more typos (codespell) (rust-lang/cargo#6903)
- Parse less JSON on null builds (rust-lang/cargo#6880)
- chore: Update opener to 0.4 (rust-lang/cargo#6902)
- Update documentation for auto-discovery. (rust-lang/cargo#6898)
- Update some doc links. (rust-lang/cargo#6897)
- Default Cargo.toml template provide help for completing the metadata (rust-lang/cargo#6881)
- Run 'cargo fmt --all' (rust-lang/cargo#6896)
- Refactor command definition (rust-lang/cargo#6894)
  • Loading branch information
@bors
bors committed May 7, 2019
2 parents b8fa4cb + fc72e56 commit 55c48b4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,10 @@ dependencies = [
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"opener 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"opener 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proptest 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1688,11 +1689,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "opener"
version = "0.3.2"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
]

Expand Down Expand Up @@ -4202,7 +4201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
"checksum open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c281318d992e4432cfa799969467003d05921582a7489a8325e37f8a450d5113"
"checksum opener 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "04b1d6b086d9b3009550f9b6f81b10ad9428cf14f404b8e1a3a06f6f012c8ec9"
"checksum opener 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "998c59e83d9474c01127a96e023b7a04bb061dd286bf8bb939d31dc8d31a7448"
"checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9"
"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
"checksum openssl-src 111.1.0+1.1.1a (registry+https://github.com/rust-lang/crates.io-index)" = "26bb632127731bf4ac49bf86a5dde12d2ca0918c2234fc39d79d4da2ccbc6da7"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 57 files
+2 −1 Cargo.toml
+0 −1 src/bin/cargo/cli.rs
+2 −2 src/cargo/core/compiler/build_context/mod.rs
+8 −2 src/cargo/core/compiler/fingerprint.rs
+1 −1 src/cargo/core/compiler/job.rs
+1 −1 src/cargo/core/compiler/job_queue.rs
+1 −2 src/cargo/core/compiler/layout.rs
+13 −9 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/interning.rs
+1 −0 src/cargo/core/mod.rs
+6 −1 src/cargo/core/package.rs
+1 −1 src/cargo/core/registry.rs
+20 −48 src/cargo/core/resolver/conflict_cache.rs
+47 −10 src/cargo/core/resolver/mod.rs
+27 −17 src/cargo/core/resolver/resolve.rs
+1 −1 src/cargo/core/resolver/types.rs
+1 −1 src/cargo/core/source/source_id.rs
+1 −1 src/cargo/core/workspace.rs
+3 −1 src/cargo/ops/cargo_compile.rs
+5 −0 src/cargo/ops/cargo_generate_lockfile.rs
+5 −0 src/cargo/ops/cargo_install.rs
+2 −0 src/cargo/ops/cargo_new.rs
+12 −3 src/cargo/ops/cargo_package.rs
+5 −0 src/cargo/ops/common_for_install_and_uninstall.rs
+7 −4 src/cargo/ops/registry.rs
+5 −1 src/cargo/ops/resolve.rs
+8 −15 src/cargo/sources/git/source.rs
+2 −2 src/cargo/sources/git/utils.rs
+549 −145 src/cargo/sources/registry/index.rs
+24 −9 src/cargo/sources/registry/local.rs
+40 −71 src/cargo/sources/registry/mod.rs
+55 −33 src/cargo/sources/registry/remote.rs
+58 −11 src/cargo/util/config.rs
+9 −0 src/cargo/util/flock.rs
+2 −1 src/cargo/util/progress.rs
+21 −16 src/cargo/util/to_url_with_base.rs
+1 −1 src/cargo/util/toml/mod.rs
+1 −1 src/doc/src/appendix/glossary.md
+1 −1 src/doc/src/guide/tests.md
+1 −1 src/doc/src/reference/environment-variables.md
+49 −11 src/doc/src/reference/manifest.md
+1 −1 src/doc/src/reference/registries.md
+13 −13 src/doc/src/reference/specifying-dependencies.md
+4 −0 src/etc/cargo.bashcomp.sh
+27 −20 tests/testsuite/alt_registry.rs
+2 −2 tests/testsuite/concurrent.rs
+3 −12 tests/testsuite/freshness.rs
+8 −0 tests/testsuite/new.rs
+1 −1 tests/testsuite/offline.rs
+0 −1 tests/testsuite/pub_priv.rs
+28 −0 tests/testsuite/registry.rs
+8 −8 tests/testsuite/resolve.rs
+5 −5 tests/testsuite/search.rs
+1 −1 tests/testsuite/support/mod.rs
+3 −1 tests/testsuite/support/paths.rs
+15 −3 tests/testsuite/support/registry.rs
+28 −7 tests/testsuite/support/resolver.rs

0 comments on commit 55c48b4

Please sign in to comment.