Skip to content

Commit

Permalink
Auto merge of rust-lang#84412 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo, rls

## cargo

18 commits in 65d57e6f384c2317f76626eac116f683e2b63665..0ed318d182e465cd66071b91ac3d265af63ef8a1
2021-04-04 15:07:52 +0000 to 2021-04-23 20:54:54 +0000
- Restore crates.io's `SourceId` hash value to before (rust-lang/cargo#9397)
- Fix loading `branch=master` patches in the v3 lock transition (rust-lang/cargo#9392)
- Update changelog for 1.52 beta changes. (rust-lang/cargo#9396)
- Fix build-std updating the index on every build. (rust-lang/cargo#9393)
- Fix typo in profile docs (rust-lang/cargo#9386)
- Fix disagreement about lockfile ordering on stable/nightly (rust-lang/cargo#9384)
- Don't give a hard error when the end-user specifies RUSTC_BOOTSTRAP=crate_name (rust-lang/cargo#9365)
- Fix rust-lang/cargo#9350 (cargo build -Z help is missing options) (rust-lang/cargo#9369)
- an struct -> a struct (rust-lang/cargo#9379)
- Handle man pages better on Windows. (rust-lang/cargo#9378)
- fix: better error message when dependency/workspace member missing (rust-lang/cargo#9368)
- Fix typo in book (rust-lang/cargo#9376)
- Don't re-use rustc cache when RUSTC_WRAPPER changes (rust-lang/cargo#9348)
- doc: add split-debuginfo doc in config chapter (rust-lang/cargo#9372)
- refactor: remove `CargoResultExt` (rust-lang/cargo#9367)
- Track "CARGO" in environment fingerprint. (rust-lang/cargo#9363)
- Update clippy lint allow set. (rust-lang/cargo#9356)
- Fix 'suport' typo in documentation (rust-lang/cargo#9338)

## rls

3 commits in 32c0fe006dcdc13e1ca0ca31de543e4436c1299e..74d1800c25498689c5b5120a1e8495fce0cd0d0d
2021-04-12 11:21:12 +0000 to 2021-04-22 21:29:51 +0000
- Bump default integration test message timeout to 30s (rust-lang/rls#1731)
- itertools = 0.9, fst = 0.4 (rust-lang/rls#1729)
- Update cargo (rust-lang/rls#1728)
  • Loading branch information
@bors
bors committed Apr 24, 2021
2 parents e11a9fa + 893ca66 commit 2b68027
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
21 changes: 9 additions & 12 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1245,12 +1245,9 @@ checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"

[[package]]
name = "fst"
version = "0.3.5"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "927fb434ff9f0115b215dc0efd2e4fbdd7448522a92a1aa37c77d6a2f8f1ebd6"
dependencies = [
"byteorder",
]
checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f"

[[package]]
name = "fuchsia-zircon"
Expand Down Expand Up @@ -1759,9 +1756,9 @@ dependencies = [

[[package]]
name = "json"
version = "0.11.15"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5"
checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"

[[package]]
name = "jsondocck"
Expand Down Expand Up @@ -3133,7 +3130,7 @@ dependencies = [
"futures 0.3.12",
"heck",
"home",
"itertools 0.8.2",
"itertools 0.9.0",
"jsonrpc-core",
"lazy_static",
"log",
Expand Down Expand Up @@ -3168,14 +3165,14 @@ dependencies = [

[[package]]
name = "rls-analysis"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534032993e1b60e5db934eab2dde54da7afd1e46c3465fddb2b29eb47cb1ed3a"
version = "0.18.2"
dependencies = [
"derive-new",
"env_logger 0.7.1",
"fst",
"itertools 0.8.2",
"itertools 0.9.0",
"json",
"lazy_static",
"log",
"rls-data",
"rls-span",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 69 files
+9 −8 CHANGELOG.md
+5 −4 crates/cargo-test-support/src/lib.rs
+1 −1 crates/cargo-test-support/src/registry.rs
+1 −2 crates/crates-io/lib.rs
+1 −2 crates/resolver-tests/src/lib.rs
+28 −14 src/bin/cargo/cli.rs
+3 −4 src/bin/cargo/commands/describe_future_incompatibilities.rs
+13 −6 src/bin/cargo/commands/help.rs
+1 −1 src/bin/cargo/main.rs
+6 −5 src/cargo/core/compiler/build_context/target_info.rs
+3 −3 src/cargo/core/compiler/compile_kind.rs
+7 −6 src/cargo/core/compiler/context/mod.rs
+34 −16 src/cargo/core/compiler/custom_build.rs
+38 −9 src/cargo/core/compiler/fingerprint.rs
+6 −6 src/cargo/core/compiler/job_queue.rs
+6 −6 src/cargo/core/compiler/mod.rs
+3 −2 src/cargo/core/compiler/timings.rs
+3 −2 src/cargo/core/dependency.rs
+67 −45 src/cargo/core/features.rs
+4 −5 src/cargo/core/manifest.rs
+11 −7 src/cargo/core/package.rs
+4 −4 src/cargo/core/package_id_spec.rs
+4 −6 src/cargo/core/profiles.rs
+63 −23 src/cargo/core/registry.rs
+5 −3 src/cargo/core/resolver/dep_cache.rs
+3 −3 src/cargo/core/resolver/encode.rs
+106 −2 src/cargo/core/source/source_id.rs
+19 −15 src/cargo/core/workspace.rs
+7 −29 src/cargo/lib.rs
+5 −5 src/cargo/ops/cargo_clean.rs
+11 −10 src/cargo/ops/cargo_install.rs
+6 −5 src/cargo/ops/cargo_new.rs
+10 −9 src/cargo/ops/cargo_package.rs
+12 −13 src/cargo/ops/common_for_install_and_uninstall.rs
+6 −4 src/cargo/ops/lockfile.rs
+12 −12 src/cargo/ops/registry.rs
+6 −7 src/cargo/ops/registry/auth.rs
+110 −33 src/cargo/ops/resolve.rs
+14 −15 src/cargo/ops/vendor.rs
+3 −3 src/cargo/sources/config.rs
+7 −5 src/cargo/sources/directory.rs
+6 −6 src/cargo/sources/git/utils.rs
+6 −5 src/cargo/sources/path.rs
+8 −7 src/cargo/sources/registry/mod.rs
+5 −4 src/cargo/sources/registry/remote.rs
+8 −6 src/cargo/sources/replaced.rs
+1 −1 src/cargo/util/command_prelude.rs
+38 −33 src/cargo/util/config/mod.rs
+0 −21 src/cargo/util/errors.rs
+4 −3 src/cargo/util/flock.rs
+1 −1 src/cargo/util/mod.rs
+45 −13 src/cargo/util/rustc.rs
+7 −7 src/cargo/util/toml/mod.rs
+5 −3 src/cargo/util/toml/targets.rs
+1 −1 src/doc/src/reference/cargo-targets.md
+8 −0 src/doc/src/reference/config.md
+1 −1 src/doc/src/reference/profiles.md
+1 −1 src/doc/src/reference/registries.md
+2 −2 src/doc/src/reference/semver.md
+10 −1 tests/build-std/main.rs
+3 −0 tests/internal.rs
+53 −10 tests/testsuite/build_script_env.rs
+60 −0 tests/testsuite/freshness.rs
+3 −1 tests/testsuite/help.rs
+72 −0 tests/testsuite/lockfile_compat.rs
+4 −7 tests/testsuite/main.rs
+77 −0 tests/testsuite/patch.rs
+106 −24 tests/testsuite/rustc_info_cache.rs
+57 −2 tests/testsuite/workspaces.rs
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated 8 files
+32 −49 Cargo.lock
+5 −4 Cargo.toml
+3 −3 rls-analysis/Cargo.toml
+1 −1 rls-analysis/src/analysis.rs
+1 −1 rls-analysis/src/lowering.rs
+1 −1 rls-analysis/src/symbol_query.rs
+1 −1 tests/client.rs
+1 −1 tests/support/mod.rs

0 comments on commit 2b68027

Please sign in to comment.