Skip to content

Commit 0c0e4c8

Browse files
authored
Rollup merge of rust-lang#98488 - Mark-Simulacrum:bump-rls, r=pietroalbini
Bump RLS to latest master on rust-lang/rls Of primary interest, this merges rust-lang/rls@ece09b8 into rust-lang/rust, which brings in the changes that fix RLS tests broken by rust-lang#97853. rust-lang#97853 already introduced that commit's changes (under rust-lang/rls@27f4044) but without putting those changes on rust-lang/rls as a branch, so we ended up with an orphan commit that caused trouble when updating submodules in rust-lang/rust. This commit, once merged into rust-lang/rust, should continue to let RLS tests to pass on rust-lang/rust's side and move us back into a healthy state where tip of the submodule points to a valid master commit in the rust-lang/rls repository. cc rust-lang#98451, but not marking as fixed as I believe we need to add verification to prevent future oversights.
2 parents b8bfe35 + 557793c commit 0c0e4c8

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Cargo.lock

+1-2
Original file line numberDiff line numberDiff line change
@@ -3101,7 +3101,6 @@ name = "racer"
31013101
version = "2.2.2"
31023102
dependencies = [
31033103
"bitflags",
3104-
"clap 2.34.0",
31053104
"derive_more",
31063105
"env_logger 0.7.1",
31073106
"humantime 2.0.1",
@@ -3325,7 +3324,7 @@ dependencies = [
33253324
"difference",
33263325
"env_logger 0.9.0",
33273326
"futures 0.3.19",
3328-
"heck 0.3.1",
3327+
"heck 0.4.0",
33293328
"home",
33303329
"itertools",
33313330
"jsonrpc-core",

0 commit comments

Comments
 (0)