Skip to content

Commit d0828a3

Browse files
authored
Rollup merge of #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 #97853. #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 #98451, but not marking as fixed as I believe we need to add verification to prevent future oversights.
2 parents e1862ca + 557793c commit d0828a3

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
@@ -3054,7 +3054,6 @@ name = "racer"
30543054
version = "2.2.2"
30553055
dependencies = [
30563056
"bitflags",
3057-
"clap 2.34.0",
30583057
"derive_more",
30593058
"env_logger 0.7.1",
30603059
"humantime 2.0.1",
@@ -3278,7 +3277,7 @@ dependencies = [
32783277
"difference",
32793278
"env_logger 0.9.0",
32803279
"futures 0.3.19",
3281-
"heck 0.3.1",
3280+
"heck 0.4.0",
32823281
"home",
32833282
"itertools",
32843283
"jsonrpc-core",

0 commit comments

Comments
 (0)