Skip to content

Commit

Permalink
Rollup merge of rust-lang#50417 - matklad:pr-50379, r=alexcrichton
Browse files Browse the repository at this point in the history 
Update Cargo

This should fix RLS

cc rust-lang#50379, rust-lang/cargo#5465
  • Loading branch information
@kennytm
kennytm committed May 3, 2018
2 parents e65098b + 70c52e5 commit 5976e8a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 42 files
+4 −0 src/bin/command_prelude.rs
+2 −0 src/bin/commands/clean.rs
+7 −1 src/bin/commands/new.rs
+323 −0 src/cargo/core/compiler/build_context/mod.rs
+0 −0 src/cargo/core/compiler/build_context/target_info.rs
+1 −1 src/cargo/core/compiler/compilation.rs
+15 −14 src/cargo/core/compiler/context/compilation_files.rs
+102 −331 src/cargo/core/compiler/context/mod.rs
+40 −40 src/cargo/core/compiler/context/unit_dependencies.rs
+14 −12 src/cargo/core/compiler/custom_build.rs
+17 −14 src/cargo/core/compiler/fingerprint.rs
+45 −23 src/cargo/core/compiler/job_queue.rs
+0 −72 src/cargo/core/compiler/links.rs
+38 −31 src/cargo/core/compiler/mod.rs
+5 −4 src/cargo/core/compiler/output_depinfo.rs
+3 −0 src/cargo/core/features.rs
+12 −9 src/cargo/core/resolver/mod.rs
+3 −0 src/cargo/core/resolver/resolve.rs
+185 −39 src/cargo/core/summary.rs
+2 −2 src/cargo/core/workspace.rs
+13 −3 src/cargo/ops/cargo_clean.rs
+7 −8 src/cargo/ops/cargo_compile.rs
+6 −2 src/cargo/ops/cargo_install.rs
+3 −2 src/cargo/ops/registry.rs
+13 −7 src/cargo/sources/registry/index.rs
+15 −12 src/cargo/util/config.rs
+6 −0 src/cargo/util/toml/mod.rs
+3 −1 src/doc/src/reference/config.md
+27 −0 src/doc/src/reference/unstable.md
+7 −7 tests/testsuite/alt_registry.rs
+1 −4 tests/testsuite/bad_config.rs
+31 −0 tests/testsuite/build_script.rs
+40 −0 tests/testsuite/clean.rs
+2 −2 tests/testsuite/directory.rs
+315 −2 tests/testsuite/features.rs
+45 −0 tests/testsuite/freshness.rs
+8 −5 tests/testsuite/install.rs
+15 −0 tests/testsuite/new.rs
+49 −0 tests/testsuite/patch.rs
+18 −18 tests/testsuite/registry.rs
+11 −5 tests/testsuite/resolve.rs
+31 −1 tests/testsuite/workspaces.rs

0 comments on commit 5976e8a

Please sign in to comment.