Skip to content

Commit

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

Brings in some perf improvements!
  • Loading branch information
bors committed Jun 7, 2017
2 parents f062832 + 453080f commit 03eb710
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 78 deletions.
122 changes: 46 additions & 76 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 87 files
+0 −3 .gitmodules
+18 −126 .travis.yml
+108 −36 Cargo.lock
+4 −1 Cargo.toml
+0 −427 Makefile.in
+1 −18 README.md
+3 −52 appveyor.yml
+0 −423 configure
+3 −3 src/bin/bench.rs
+11 −8 src/bin/cargo.rs
+2 −2 src/bin/help.rs
+3 −3 src/bin/locate_project.rs
+3 −3 src/bin/login.rs
+4 −3 src/bin/run.rs
+3 −3 src/bin/rustc.rs
+3 −3 src/bin/test.rs
+144 −172 src/cargo/core/dependency.rs
+1 −1 src/cargo/core/mod.rs
+6 −5 src/cargo/core/package.rs
+6 −38 src/cargo/core/package_id.rs
+13 −13 src/cargo/core/package_id_spec.rs
+142 −109 src/cargo/core/registry.rs
+6 −5 src/cargo/core/resolver/encode.rs
+256 −122 src/cargo/core/resolver/mod.rs
+59 −47 src/cargo/core/source.rs
+26 −15 src/cargo/core/summary.rs
+9 −8 src/cargo/core/workspace.rs
+53 −25 src/cargo/lib.rs
+11 −9 src/cargo/ops/cargo_clean.rs
+5 −0 src/cargo/ops/cargo_compile.rs
+32 −31 src/cargo/ops/cargo_install.rs
+15 −14 src/cargo/ops/cargo_new.rs
+20 −19 src/cargo/ops/cargo_package.rs
+8 −7 src/cargo/ops/cargo_read_manifest.rs
+14 −5 src/cargo/ops/cargo_run.rs
+37 −8 src/cargo/ops/cargo_rustc/context.rs
+12 −9 src/cargo/ops/cargo_rustc/custom_build.rs
+20 −23 src/cargo/ops/cargo_rustc/fingerprint.rs
+101 −46 src/cargo/ops/cargo_rustc/job_queue.rs
+2 −2 src/cargo/ops/cargo_rustc/layout.rs
+52 −43 src/cargo/ops/cargo_rustc/mod.rs
+2 −2 src/cargo/ops/cargo_rustc/output_depinfo.rs
+16 −6 src/cargo/ops/cargo_test.rs
+11 −10 src/cargo/ops/lockfile.rs
+11 −10 src/cargo/ops/registry.rs
+8 −5 src/cargo/ops/resolve.rs
+11 −10 src/cargo/sources/config.rs
+27 −22 src/cargo/sources/directory.rs
+8 −5 src/cargo/sources/git/source.rs
+32 −27 src/cargo/sources/git/utils.rs
+16 −9 src/cargo/sources/path.rs
+70 −88 src/cargo/sources/registry/index.rs
+9 −5 src/cargo/sources/registry/local.rs
+119 −16 src/cargo/sources/registry/mod.rs
+17 −10 src/cargo/sources/registry/remote.rs
+19 −16 src/cargo/sources/replaced.rs
+6 −6 src/cargo/util/cfg.rs
+71 −48 src/cargo/util/config.rs
+71 −373 src/cargo/util/errors.rs
+13 −11 src/cargo/util/flock.rs
+3 −1 src/cargo/util/graph.rs
+3 −3 src/cargo/util/important_paths.rs
+2 −3 src/cargo/util/mod.rs
+73 −55 src/cargo/util/network.rs
+20 −20 src/cargo/util/paths.rs
+50 −34 src/cargo/util/process_builder.rs
+2 −5 src/cargo/util/rustc.rs
+3 −3 src/cargo/util/to_url.rs
+42 −43 src/cargo/util/toml.rs
+0 −27 src/ci/docker/android/Dockerfile
+0 −18 src/ci/docker/cross/Dockerfile
+0 −2 src/ci/docker/dist/Dockerfile
+0 −51 src/ci/docker/run.sh
+0 −11 src/ci/docker/x86_64-musl/Dockerfile
+28 −0 src/ci/dox.sh
+0 −69 src/ci/run.sh
+1 −0 src/crates-io/Cargo.toml
+64 −85 src/crates-io/lib.rs
+9 −1 src/doc/environment-variables.md
+1 −1 src/doc/external-tools.md
+11 −0 src/doc/manifest.md
+0 −1 src/rust-installer
+2 −0 tests/cargotest/lib.rs
+3 −2 tests/cargotest/support/mod.rs
+12 −5 tests/doc.rs
+184 −0 tests/jobserver.rs
+21 −5 tests/resolve.rs

0 comments on commit 03eb710

Please sign in to comment.