Skip to content

Commit

Permalink
Rollup merge of rust-lang#49639 - matklad:cargo, r=kennytm
Browse files Browse the repository at this point in the history 
Update Cargo

This includes at least two notable changes:

  * a regression is fixed where Cargo would update index on every
    operation rust-lang/cargo#5288
  * a new unstable `--out-dir` option is implemented
    rust-lang/cargo#5203
  • Loading branch information
@kennytm
kennytm committed Apr 4, 2018
2 parents a4f744d + db859f5 commit b6b8ed2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 43 files
+0 −3 .travis.yml
+18 −3 src/bin/cli.rs
+1 −0 src/bin/command_prelude.rs
+8 −1 src/bin/commands/build.rs
+1 −1 src/bin/commands/locate_project.rs
+16 −14 src/cargo/core/features.rs
+32 −31 src/cargo/core/interning.rs
+31 −17 src/cargo/core/manifest.rs
+1 −1 src/cargo/core/mod.rs
+2 −1 src/cargo/core/resolver/conflict_cache.rs
+409 −0 src/cargo/core/resolver/context.rs
+2 −1 src/cargo/core/resolver/encode.rs
+312 −1,292 src/cargo/core/resolver/mod.rs
+218 −0 src/cargo/core/resolver/resolve.rs
+394 −0 src/cargo/core/resolver/types.rs
+7 −6 src/cargo/ops/cargo_clean.rs
+9 −1 src/cargo/ops/cargo_compile.rs
+1 −1 src/cargo/ops/cargo_doc.rs
+1 −1 src/cargo/ops/cargo_generate_lockfile.rs
+1 −1 src/cargo/ops/cargo_install.rs
+12 −2 src/cargo/ops/cargo_new.rs
+2 −1 src/cargo/ops/cargo_output_metadata.rs
+1 −0 src/cargo/ops/cargo_package.rs
+449 −0 src/cargo/ops/cargo_rustc/context/compilation_files.rs
+39 −638 src/cargo/ops/cargo_rustc/context/mod.rs
+277 −0 src/cargo/ops/cargo_rustc/context/target_info.rs
+3 −3 src/cargo/ops/cargo_rustc/custom_build.rs
+27 −25 src/cargo/ops/cargo_rustc/fingerprint.rs
+90 −70 src/cargo/ops/cargo_rustc/mod.rs
+2 −2 src/cargo/ops/cargo_rustc/output_depinfo.rs
+21 −3 src/cargo/ops/resolve.rs
+6 −3 src/cargo/sources/git/utils.rs
+4 −7 src/cargo/sources/registry/index.rs
+134 −42 src/cargo/sources/registry/mod.rs
+4 −3 src/cargo/sources/replaced.rs
+2 −24 src/cargo/util/flock.rs
+36 −22 src/cargo/util/toml/mod.rs
+12 −0 tests/testsuite/cargo_command.rs
+58 −0 tests/testsuite/freshness.rs
+40 −2 tests/testsuite/init.rs
+1 −0 tests/testsuite/main.rs
+295 −0 tests/testsuite/out_dir.rs
+15 −15 tests/testsuite/package.rs

0 comments on commit b6b8ed2

Please sign in to comment.