diff options
| author | bors <bors@rust-lang.org> | 2020-01-15 09:34:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-15 09:34:49 +0000 |
| commit | c74353c7d2e61b111a9241490b9fbbd1ebe491fe (patch) | |
| tree | 5b6ee97ccb30e577a806ad32b72dc64c9c07cba9 /src/tools | |
| parent | 632387f38dfbac0f2b8b8900c840fff7f1fb888e (diff) | |
| parent | 55cb505257f3dd86fbae051fe90dc34efa7d0151 (diff) | |
| download | rust-c74353c7d2e61b111a9241490b9fbbd1ebe491fe.tar.gz rust-c74353c7d2e61b111a9241490b9fbbd1ebe491fe.zip | |
Auto merge of #68221 - ehuss:update-cargo-rls, r=alexcrichton
Update cargo rls ## cargo 12 commits in 6e1ca924a67dd1ac89c33f294ef26b5c43b89168..ad3dbe10e1e654fb1f032a5dd9481d7cbaa00d65 2020-01-06 19:11:37 +0000 to 2020-01-13 21:37:15 +0000 - Add named config profiles. (rust-lang/cargo#7750) - Make cargo-rustc crate-type-aware (rust-lang/cargo#7755) - Rename `Kind` (rust-lang/cargo#7791) - Update bash completion (rust-lang/cargo#7789) - Add another curl spurious network error (rust-lang/cargo#7788) - Some small tweaks around error in configuration (rust-lang/cargo#7783) - Fix tests with `url` crate update (rust-lang/cargo#7787) - Fix .gitignore of Cargo.lock in a subdirectory. (rust-lang/cargo#7779) - Bump crates-io (rust-lang/cargo#7778) - Migrate from the `failure` crate to `anyhow` (rust-lang/cargo#7776) - Fix several needless_borrow clippy lints. (rust-lang/cargo#7771) - Fix some links (rust-lang/cargo#7770) ## rls 2 commits in 7c0489c5ff4f5c594e65a3b22efd9ce373deab9b..b27e1173969639448cd2e486b1c5f0fcb1b3b17c 2020-01-04 20:15:37 +0100 to 2020-01-13 11:40:20 +0100 - Update Cargo (rust-lang-nursery/rls#1613) - Rustup to rust-lang/rust#68024 (rust-lang-nursery/rls#1612)
Diffstat (limited to 'src/tools')
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 2 | ||||
| m--------- | src/tools/rls | 0 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 6e1ca924a67dd1ac89c33f294ef26b5c43b8916 +Subproject ad3dbe10e1e654fb1f032a5dd9481d7cbaa00d6 diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 80ef8dd6626..a26c3a4acab 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -12,7 +12,7 @@ log = "0.4" regex = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -rustfix = "0.4.1" +rustfix = "0.5.0" lazy_static = "1.0" walkdir = "2" diff --git a/src/tools/rls b/src/tools/rls -Subproject 7c0489c5ff4f5c594e65a3b22efd9ce373deab9 +Subproject b27e1173969639448cd2e486b1c5f0fcb1b3b17 diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index fced6c52012..936e8ae895a 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -65,7 +65,7 @@ serde_json = { version = "1.0.31", features = ["raw_value"] } smallvec-0_6 = { package = "smallvec", version = "0.6", features = ['union', 'may_dangle'] } smallvec = { version = "1.0", features = ['union', 'may_dangle'] } url = { version = "2.0", features = ['serde'] } -syn = { version = "0.15", features = ['full'] } +syn = { version = "0.15", features = ['full', 'extra-traits'] } [target.'cfg(not(windows))'.dependencies] openssl = { version = "0.10.12", optional = true } |
