aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-02-12 12:06:26 +0000
committerGitHub <[email protected]>2021-02-12 12:06:26 +0000
commite0fc2af1184bed5af0a74276c261c79f685fa5d7 (patch)
treea889b01d490f653970ff54320e2edcb91c1893b1
parentb0f20a795d6b1f8d36d1cbe294e54ac592b98f5e (diff)
parent70f388cedba89c204131ebc81a202563a8e19437 (diff)
Merge #7651
7651: Pin Rust to 1.49.0 on CI r=jonas-schievink a=jonas-schievink Co-authored-by: Jonas Schievink <[email protected]>
-rw-r--r--.github/workflows/ci.yaml10
-rw-r--r--crates/ide/src/references/rename.rs6
-rw-r--r--crates/parser/src/grammar/params.rs11
-rw-r--r--crates/rust-analyzer/src/main_loop.rs2
-rw-r--r--crates/rust-analyzer/src/to_proto.rs3
5 files changed, 21 insertions, 11 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1850068a3..ec9ef59a8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -53,11 +53,19 @@ jobs:
53 - name: Install Rust toolchain 53 - name: Install Rust toolchain
54 uses: actions-rs/toolchain@v1 54 uses: actions-rs/toolchain@v1
55 with: 55 with:
56 toolchain: stable 56 toolchain: 1.49.0 # FIXME: CI is failing on 1.50
57 profile: minimal 57 profile: minimal
58 override: true 58 override: true
59 components: rustfmt, rust-src 59 components: rustfmt, rust-src
60 60
61 - name: Install rustfmt
62 uses: actions-rs/toolchain@v1
63 with:
64 toolchain: stable
65 profile: minimal
66 override: false
67 components: rustfmt
68
61 - name: Cache cargo directories 69 - name: Cache cargo directories
62 uses: actions/cache@v2 70 uses: actions/cache@v2
63 with: 71 with:
diff --git a/crates/ide/src/references/rename.rs b/crates/ide/src/references/rename.rs
index 99a558532..ebb1ce7dd 100644
--- a/crates/ide/src/references/rename.rs
+++ b/crates/ide/src/references/rename.rs
@@ -415,9 +415,9 @@ fn rename_reference(
415) -> RenameResult<SourceChange> { 415) -> RenameResult<SourceChange> {
416 let ident_kind = check_identifier(new_name)?; 416 let ident_kind = check_identifier(new_name)?;
417 417
418 let def_is_lbl_or_lt = matches!(def, 418 let def_is_lbl_or_lt = matches!(
419 Definition::GenericParam(hir::GenericParam::LifetimeParam(_)) 419 def,
420 | Definition::Label(_) 420 Definition::GenericParam(hir::GenericParam::LifetimeParam(_)) | Definition::Label(_)
421 ); 421 );
422 match (ident_kind, def) { 422 match (ident_kind, def) {
423 (IdentifierKind::ToSelf, _) 423 (IdentifierKind::ToSelf, _)
diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs
index 6a98d7368..e313f6fb7 100644
--- a/crates/parser/src/grammar/params.rs
+++ b/crates/parser/src/grammar/params.rs
@@ -169,11 +169,12 @@ fn opt_self_param(p: &mut Parser, m: Marker) {
169 let la1 = p.nth(1); 169 let la1 = p.nth(1);
170 let la2 = p.nth(2); 170 let la2 = p.nth(2);
171 let la3 = p.nth(3); 171 let la3 = p.nth(3);
172 if !matches!((p.current(), la1, la2, la3), 172 if !matches!(
173 (T![&], T![self], _, _) 173 (p.current(), la1, la2, la3),
174 | (T![&], T![mut], T![self], _) 174 (T![&], T![self], _, _)
175 | (T![&], LIFETIME_IDENT, T![self], _) 175 | (T![&], T![mut], T![self], _)
176 | (T![&], LIFETIME_IDENT, T![mut], T![self]) 176 | (T![&], LIFETIME_IDENT, T![self], _)
177 | (T![&], LIFETIME_IDENT, T![mut], T![self])
177 ) { 178 ) {
178 return m.abandon(p); 179 return m.abandon(p);
179 } 180 }
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index f4fd1ac13..bdffff5ae 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -398,7 +398,7 @@ impl GlobalState {
398 } 398 }
399 399
400 let state_changed = self.process_changes(); 400 let state_changed = self.process_changes();
401 let is_ready = matches!(self.status, Status::Ready { .. } ); 401 let is_ready = matches!(self.status, Status::Ready { .. });
402 if prev_status == Status::Loading && is_ready { 402 if prev_status == Status::Loading && is_ready {
403 for flycheck in &self.flycheck { 403 for flycheck in &self.flycheck {
404 flycheck.update(); 404 flycheck.update();
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 5236932e8..be10ac1ae 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -528,7 +528,8 @@ pub(crate) fn url_from_abs_path(path: &Path) -> lsp_types::Url {
528 assert!(path.is_absolute()); 528 assert!(path.is_absolute());
529 let url = lsp_types::Url::from_file_path(path).unwrap(); 529 let url = lsp_types::Url::from_file_path(path).unwrap();
530 match path.components().next() { 530 match path.components().next() {
531 Some(path::Component::Prefix(prefix)) if matches!(prefix.kind(), path::Prefix::Disk(_) | path::Prefix::VerbatimDisk(_)) => 531 Some(path::Component::Prefix(prefix))
532 if matches!(prefix.kind(), path::Prefix::Disk(_) | path::Prefix::VerbatimDisk(_)) =>
532 { 533 {
533 // Need to lowercase driver letter 534 // Need to lowercase driver letter
534 } 535 }