Update cargo to fix deprecation warnings

Implemented in rust-lang/cargo#6600
rust-lang · Jan 27, 2019 · cd39cf7 · cd39cf7
1 parent 7a58c6d
commit cd39cf7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -204,15 +204,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cargo"
-version = "0.34.0"
+version = "0.35.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.22.0",
+ "crates-io 0.23.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)",
@@ -496,7 +496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "crates-io"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
  "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2113,7 +2113,7 @@ dependencies = [
 name = "rls"
 version = "1.31.6"
 dependencies = [
- "cargo 0.34.0",
+ "cargo 0.35.0",
  "cargo_metadata 0.6.2 (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)",

diff --git a/src/tools/cargo b/src/tools/cargo
+2 −2		Cargo.toml
+5 −2		src/bin/cargo/commands/rustdoc.rs
+1 −2		src/cargo/core/profiles.rs
+31 −15		src/cargo/core/resolver/types.rs
+2 −2		src/cargo/core/source/source_id.rs
+22 −25		src/cargo/ops/cargo_new.rs
+25 −6		src/cargo/ops/lockfile.rs
+1 −1		src/cargo/util/errors.rs
+1 −1		src/cargo/util/process_builder.rs
+2 −1		src/cargo/util/toml/targets.rs
+1 −1		src/cargo/util/workspace.rs
+1 −1		src/crates-io/Cargo.toml
+38 −0		src/doc/src/guide/continuous-integration.md
+2 −1		src/doc/src/reference/manifest.md
+4 −1		src/etc/cargo.bashcomp.sh
+6 −8		tests/testsuite/alt_registry.rs
+4 −5		tests/testsuite/build.rs
+5 −4		tests/testsuite/build_script.rs
+2 −3		tests/testsuite/concurrent.rs
+2 −3		tests/testsuite/death.rs
+8 −2		tests/testsuite/fix.rs
+2 −2		tests/testsuite/generate_lockfile.rs
+11 −9		tests/testsuite/init.rs
+12 −3		tests/testsuite/lockfile_compat.rs
+4 −2		tests/testsuite/metadata.rs
+1 −5		tests/testsuite/new.rs
+12 −6		tests/testsuite/package.rs
+48 −13		tests/testsuite/resolve.rs
+3 −3		tests/testsuite/support/cross_compile.rs
+11 −0		tests/testsuite/support/mod.rs
+2 −2		tests/testsuite/support/paths.rs
+1 −1		tests/testsuite/support/publish.rs
+0 −1		tests/testsuite/support/registry.rs
+88 −61		tests/testsuite/support/resolver.rs
+9 −5		tests/testsuite/update.rs