Skip to content

Commit

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

16 commits in 6f3e9c367abb497c64f360c3839dab5e74928d5c..b6581d383ed596b133e330011658c6f83cf85c2f
2019-04-04 14:11:33 +0000 to 2019-04-16 16:02:11 +0000
- Fix new_warning_with_corrupt_ws missing "USER". (rust-lang/cargo#6857)
- Ignore Clippy redundant_closure (rust-lang/cargo#6855)
- Pass OsStr/OsString args through to the process spawned by cargo run. (rust-lang/cargo#6849)
- Bump to 0.37.0 (rust-lang/cargo#6852)
- Fix test include_overrides_gitignore. (rust-lang/cargo#6850)
- Clarify optional registry key behaviour (rust-lang/cargo#6851)
- Ensure Summary::checksum works for registry crates (rust-lang/cargo#6842)
- Better error if PathSource::walk can't access something. (rust-lang/cargo#6841)
- Improve warning in `cargo new` with parse error. (rust-lang/cargo#6839)
- Improve error message for `publish` key restriction. (rust-lang/cargo#6838)
- Remove `Freshness` from `DependencyQueue` (rust-lang/cargo#6832)
- testsuite: cleanup for `alternative-registries` (rust-lang/cargo#6837)
- Improve error message to rerun a test in a workspace. (rust-lang/cargo#6824)
- Fix mutable_borrow_reservation_conflict warning. (rust-lang/cargo#6829)
- Add install-upgrade. (rust-lang/cargo#6798)
- Clarify docs of install without <crate> (rust-lang/cargo#6823)
  • Loading branch information
@bors
bors committed Apr 16, 2019
2 parents 70f1309 + df7445b commit c132c96
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "cargo"
version = "0.36.0"
version = "0.37.0"
dependencies = [
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"crates-io 0.24.0",
"crates-io 0.25.0",
"crossbeam-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -530,7 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "crates-io"
version = "0.24.0"
version = "0.25.0"
dependencies = [
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -2215,7 +2215,7 @@ dependencies = [
name = "rls"
version = "1.35.0"
dependencies = [
"cargo 0.36.0",
"cargo 0.37.0",
"cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy_lints 0.0.212",
"crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 65 files
+2 −2 Cargo.toml
+1 −0 src/bin/cargo/cli.rs
+13 −3 src/bin/cargo/commands/install.rs
+8 −1 src/bin/cargo/commands/owner.rs
+1 −1 src/bin/cargo/commands/run.rs
+12 −6 src/bin/cargo/commands/test.rs
+2 −1 src/bin/cargo/commands/version.rs
+1 −3 src/cargo/core/compiler/build_context/mod.rs
+6 −1 src/cargo/core/compiler/context/compilation_files.rs
+4 −3 src/cargo/core/compiler/context/mod.rs
+80 −54 src/cargo/core/compiler/custom_build.rs
+788 −415 src/cargo/core/compiler/fingerprint.rs
+30 −10 src/cargo/core/compiler/job.rs
+18 −28 src/cargo/core/compiler/job_queue.rs
+20 −23 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/output_depinfo.rs
+2 −0 src/cargo/core/features.rs
+3 −4 src/cargo/core/manifest.rs
+4 −0 src/cargo/core/package.rs
+1 −1 src/cargo/core/source/mod.rs
+1 −2 src/cargo/core/summary.rs
+1 −0 src/cargo/lib.rs
+29 −8 src/cargo/ops/cargo_compile.rs
+151 −163 src/cargo/ops/cargo_install.rs
+2 −2 src/cargo/ops/cargo_new.rs
+1 −4 src/cargo/ops/cargo_package.rs
+2 −1 src/cargo/ops/cargo_run.rs
+1 −1 src/cargo/ops/cargo_test.rs
+50 −55 src/cargo/ops/cargo_uninstall.rs
+680 −164 src/cargo/ops/common_for_install_and_uninstall.rs
+23 −20 src/cargo/ops/registry.rs
+5 −7 src/cargo/sources/directory.rs
+2 −1 src/cargo/sources/git/utils.rs
+5 −4 src/cargo/sources/path.rs
+2 −2 src/cargo/sources/registry/index.rs
+18 −1 src/cargo/sources/registry/mod.rs
+3 −1 src/cargo/sources/replaced.rs
+20 −0 src/cargo/util/command_prelude.rs
+2 −7 src/cargo/util/config.rs
+19 −58 src/cargo/util/dependency_queue.rs
+11 −2 src/cargo/util/errors.rs
+1 −1 src/cargo/util/hex.rs
+1 −1 src/cargo/util/mod.rs
+1 −1 src/crates-io/Cargo.toml
+1 −1 src/doc/src/reference/registries.md
+32 −0 src/doc/src/reference/unstable.md
+7 −1 tests/testsuite/alt_registry.rs
+139 −1 tests/testsuite/build_script.rs
+1 −4 tests/testsuite/clean.rs
+16 −12 tests/testsuite/directory.rs
+4 −1 tests/testsuite/fix.rs
+75 −0 tests/testsuite/freshness.rs
+19 −101 tests/testsuite/git.rs
+49 −17 tests/testsuite/install.rs
+786 −0 tests/testsuite/install_upgrade.rs
+2 −0 tests/testsuite/main.rs
+8 −11 tests/testsuite/package.rs
+42 −8 tests/testsuite/publish.rs
+0 −1 tests/testsuite/rename_deps.rs
+30 −1 tests/testsuite/run.rs
+6 −1 tests/testsuite/support/mod.rs
+2 −7 tests/testsuite/support/registry.rs
+49 −15 tests/testsuite/test.rs
+12 −6 tests/testsuite/tool_paths.rs
+20 −0 tests/testsuite/workspaces.rs

0 comments on commit c132c96

Please sign in to comment.