Skip to content

Commit

Permalink
Rollup merge of rust-lang#60436 - Xanewok:update-rls, r=Manishearth
Browse files Browse the repository at this point in the history 
Update RLS and Cargo

Fixes the `test-fail` RLS toolstate caused by rust-lang#59114.

r? @Centril @Manishearth
  • Loading branch information
@Centril
Centril authored May 3, 2019
2 parents dbe700b + 31407e8 commit ba4a1e1
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 58 files
+489 −0 CHANGELOG.md
+15 −143 src/cargo/core/compiler/build_context/mod.rs
+156 −10 src/cargo/core/compiler/build_context/target_info.rs
+1 −1 src/cargo/core/compiler/build_plan.rs
+4 −3 src/cargo/core/compiler/context/compilation_files.rs
+6 −51 src/cargo/core/compiler/context/mod.rs
+24 −21 src/cargo/core/compiler/context/unit_dependencies.rs
+17 −15 src/cargo/core/compiler/fingerprint.rs
+112 −181 src/cargo/core/compiler/job_queue.rs
+30 −7 src/cargo/core/compiler/mod.rs
+171 −0 src/cargo/core/compiler/unit.rs
+4 −0 src/cargo/core/dependency.rs
+3 −0 src/cargo/core/features.rs
+21 −19 src/cargo/core/package_id_spec.rs
+2 −2 src/cargo/core/profiles.rs
+1 −1 src/cargo/core/resolver/conflict_cache.rs
+26 −310 src/cargo/core/resolver/context.rs
+478 −0 src/cargo/core/resolver/dep_cache.rs
+25 −1 src/cargo/core/resolver/errors.rs
+31 −35 src/cargo/core/resolver/mod.rs
+25 −0 src/cargo/core/resolver/resolve.rs
+36 −218 src/cargo/core/resolver/types.rs
+9 −0 src/cargo/core/summary.rs
+22 −7 src/cargo/core/workspace.rs
+16 −19 src/cargo/ops/cargo_clean.rs
+33 −38 src/cargo/ops/cargo_compile.rs
+2 −11 src/cargo/ops/cargo_generate_lockfile.rs
+1 −4 src/cargo/ops/cargo_install.rs
+10 −1 src/cargo/ops/cargo_package.rs
+2 −2 src/cargo/ops/registry.rs
+15 −21 src/cargo/ops/resolve.rs
+1 −1 src/cargo/sources/git/utils.rs
+10 −4 src/cargo/sources/registry/index.rs
+7 −1 src/cargo/sources/registry/mod.rs
+12 −0 src/cargo/sources/registry/remote.rs
+24 −8 src/cargo/util/config.rs
+3 −7 src/cargo/util/dependency_queue.rs
+2 −0 src/cargo/util/mod.rs
+5 −5 src/cargo/util/rustc.rs
+7 −1 src/cargo/util/to_url.rs
+45 −0 src/cargo/util/to_url_with_base.rs
+12 −1 src/cargo/util/toml/mod.rs
+2 −0 src/doc/.gitignore
+1 −1 src/doc/src/reference/build-scripts.md
+39 −52 src/doc/src/reference/source-replacement.md
+17 −0 src/doc/src/reference/unstable.md
+169 −1 tests/testsuite/alt_registry.rs
+12 −325 tests/testsuite/build.rs
+17 −14 tests/testsuite/features.rs
+0 −169 tests/testsuite/git.rs
+2 −0 tests/testsuite/main.rs
+548 −0 tests/testsuite/offline.rs
+205 −0 tests/testsuite/pub_priv.rs
+0 −24 tests/testsuite/registry.rs
+5 −5 tests/testsuite/resolve.rs
+6 −0 tests/testsuite/support/paths.rs
+4 −5 tests/testsuite/support/resolver.rs
+8 −7 tests/testsuite/test.rs
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 20e326 to 5b8e99

0 comments on commit ba4a1e1

Please sign in to comment.