Skip to content

Commit

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

This includes rust-lang/cargo#5353, which we  want to test via opt-in in the wild.

This'll break RLS, the fix is rust-lang/rls#822
  • Loading branch information
@kennytm
kennytm committed Apr 14, 2018
2 parents 410e895 + d015945 commit fbbc990
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 74 files
+1 −1 .travis.yml
+17 −0 ARCHITECTURE.md
+11 −11 CONTRIBUTING.md
+1 −1 appveyor.yml
+6 −3 src/bin/commands/bench.rs
+2 −2 src/bin/commands/build.rs
+4 −0 src/bin/commands/install.rs
+3 −3 src/bin/commands/run.rs
+9 −5 src/bin/commands/test.rs
+0 −0 src/cargo/core/compiler/compilation.rs
+2 −4 src/cargo/core/compiler/context/compilation_files.rs
+167 −19 src/cargo/core/compiler/context/mod.rs
+1 −1 src/cargo/core/compiler/context/target_info.rs
+1 −2 src/cargo/core/compiler/context/unit_dependencies.rs
+0 −0 src/cargo/core/compiler/custom_build.rs
+1 −1 src/cargo/core/compiler/fingerprint.rs
+0 −0 src/cargo/core/compiler/job.rs
+1 −4 src/cargo/core/compiler/job_queue.rs
+1 −1 src/cargo/core/compiler/layout.rs
+0 −0 src/cargo/core/compiler/links.rs
+28 −178 src/cargo/core/compiler/mod.rs
+1 −2 src/cargo/core/compiler/output_depinfo.rs
+7 −5 src/cargo/core/dependency.rs
+8 −2 src/cargo/core/features.rs
+11 −0 src/cargo/core/interning.rs
+2 −1 src/cargo/core/mod.rs
+3 −3 src/cargo/core/package.rs
+39 −0 src/cargo/core/package_id_spec.rs
+55 −54 src/cargo/core/resolver/context.rs
+5 −4 src/cargo/core/resolver/mod.rs
+8 −7 src/cargo/core/resolver/types.rs
+1 −1 src/cargo/core/source/source_id.rs
+129 −41 src/cargo/core/summary.rs
+1 −1 src/cargo/core/workspace.rs
+6 −19 src/cargo/ops/cargo_clean.rs
+43 −28 src/cargo/ops/cargo_compile.rs
+23 −9 src/cargo/ops/cargo_install.rs
+21 −19 src/cargo/ops/cargo_new.rs
+3 −2 src/cargo/ops/cargo_package.rs
+1 −1 src/cargo/ops/cargo_run.rs
+2 −1 src/cargo/ops/cargo_test.rs
+0 −5 src/cargo/ops/mod.rs
+18 −6 src/cargo/ops/registry.rs
+102 −60 src/cargo/ops/resolve.rs
+5 −7 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/sources/path.rs
+7 −0 src/cargo/util/config.rs
+4 −6 src/cargo/util/paths.rs
+22 −14 src/cargo/util/profile.rs
+3 −1 src/cargo/util/rustc.rs
+2 −3 src/cargo/util/toml/targets.rs
+9 −14 src/crates-io/lib.rs
+1 −0 src/doc/src/SUMMARY.md
+3 −1 src/doc/src/index.md
+1 −0 src/doc/src/reference/index.md
+15 −0 src/doc/src/reference/manifest.md
+194 −0 src/doc/src/reference/unstable.md
+1 −1 src/etc/man/cargo-bench.1
+1 −1 src/etc/man/cargo-build.1
+1 −1 src/etc/man/cargo-check.1
+1 −1 src/etc/man/cargo-doc.1
+1 −1 src/etc/man/cargo-package.1
+1 −1 src/etc/man/cargo-run.1
+1 −1 src/etc/man/cargo-test.1
+1 −1 tests/testsuite/build_script.rs
+31 −1 tests/testsuite/doc.rs
+82 −0 tests/testsuite/features.rs
+57 −0 tests/testsuite/freshness.rs
+1 −1 tests/testsuite/git.rs
+44 −1 tests/testsuite/install.rs
+1 −1 tests/testsuite/metadata.rs
+8 −8 tests/testsuite/out_dir.rs
+13 −10 tests/testsuite/required_features.rs
+1 −1 tests/testsuite/resolve.rs
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from faccf0 to 7bda11

0 comments on commit fbbc990

Please sign in to comment.