nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-13 17:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7651

Browse Source 
7651: Pin Rust to 1.49.0 on CI r=jonas-schievink a=jonas-schievink



Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2021-02-12 12:06:26 +00:00 committed by GitHub
commit e0fc2af118
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci.yaml vendored
View File

@ -53,11 +53,19 @@ jobs:
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
toolchain: 1.49.0 # FIXME: CI is failing on 1.50
profile: minimal
override: true
components: rustfmt, rust-src
- name: Install rustfmt
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: false
components: rustfmt
- name: Cache cargo directories
uses: actions/cache@v2
with:

6
crates/ide/src/references/rename.rs
View File

@ -415,9 +415,9 @@ fn rename_reference(
) -> RenameResult<SourceChange> {
let ident_kind = check_identifier(new_name)?;
let def_is_lbl_or_lt = matches!(def,
Definition::GenericParam(hir::GenericParam::LifetimeParam(_))
| Definition::Label(_)
let def_is_lbl_or_lt = matches!(
def,
Definition::GenericParam(hir::GenericParam::LifetimeParam(_)) | Definition::Label(_)
);
match (ident_kind, def) {
(IdentifierKind::ToSelf, _)

11
crates/parser/src/grammar/params.rs
View File

@ -169,11 +169,12 @@ fn opt_self_param(p: &mut Parser, m: Marker) {
let la1 = p.nth(1);
let la2 = p.nth(2);
let la3 = p.nth(3);
if !matches!((p.current(), la1, la2, la3),
(T![&], T![self], _, _)
| (T![&], T![mut], T![self], _)
| (T![&], LIFETIME_IDENT, T![self], _)
| (T![&], LIFETIME_IDENT, T![mut], T![self])
if !matches!(
(p.current(), la1, la2, la3),
(T![&], T![self], _, _)
| (T![&], T![mut], T![self], _)
| (T![&], LIFETIME_IDENT, T![self], _)
| (T![&], LIFETIME_IDENT, T![mut], T![self])
) {
return m.abandon(p);
}

2
crates/rust-analyzer/src/main_loop.rs
View File

@ -398,7 +398,7 @@ impl GlobalState {
}
let state_changed = self.process_changes();
let is_ready = matches!(self.status, Status::Ready { .. } );
let is_ready = matches!(self.status, Status::Ready { .. });
if prev_status == Status::Loading && is_ready {
for flycheck in &self.flycheck {
flycheck.update();

3
crates/rust-analyzer/src/to_proto.rs
View File

@ -528,7 +528,8 @@ pub(crate) fn url_from_abs_path(path: &Path) -> lsp_types::Url {
assert!(path.is_absolute());
let url = lsp_types::Url::from_file_path(path).unwrap();
match path.components().next() {
Some(path::Component::Prefix(prefix)) if matches!(prefix.kind(), path::Prefix::Disk(_) | path::Prefix::VerbatimDisk(_)) =>
Some(path::Component::Prefix(prefix))
if matches!(prefix.kind(), path::Prefix::Disk(_) | path::Prefix::VerbatimDisk(_)) =>
{
// Need to lowercase driver letter
}