nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-02 18:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7135

Browse Source 
7135: Fix warnings on nightly r=lnicola a=cynecx



Co-authored-by: cynecx <me@cynecx.net>
This commit is contained in:
bors[bot] 2021-01-02 20:47:27 +00:00 committed by GitHub
commit 895d97cfa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/assists/src/utils.rs
View File

@ -94,7 +94,7 @@ pub fn filter_assoc_items(
ast::AssocItem::MacroCall(_) => None,
}
.is_some()
};
}
items
.iter()

15
crates/hir_def/src/attr.rs
View File

@ -260,14 +260,13 @@ impl Attrs {
}
pub fn docs(&self) -> Option<Documentation> {
let docs = self
.by_key("doc")
.attrs()
.flat_map(|attr| match attr.input.as_ref()? {
AttrInput::Literal(s) => Some(s),
AttrInput::TokenTree(_) => None,
})
.intersperse(&SmolStr::new_inline("\n"))
let docs = self.by_key("doc").attrs().flat_map(|attr| match attr.input.as_ref()? {
AttrInput::Literal(s) => Some(s),
AttrInput::TokenTree(_) => None,
});
// FIXME: Replace `Itertools::intersperse` with `Iterator::intersperse[_with]` until the
// libstd api gets stabilized (https://github.com/rust-lang/rust/issues/79524).
let docs = Itertools::intersperse(docs, &SmolStr::new_inline("\n"))
.map(|it| it.as_str())
.collect::<String>();
if docs.is_empty() {

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

@ -679,7 +679,7 @@ fn schema(fields: &[(&'static str, &'static str, &[&str], &str)]) -> serde_json:
for ((f1, ..), (f2, ..)) in fields.iter().zip(&fields[1..]) {
fn key(f: &str) -> &str {
f.splitn(2, "_").next().unwrap()
};
}
assert!(key(f1) <= key(f2), "wrong field order: {:?} {:?}", f1, f2);
}

4
crates/syntax/src/ast/edit.rs
View File

@ -220,7 +220,7 @@ impl ast::RecordExprFieldList {
InsertPosition::After($anchor.syntax().clone().into())
}
};
};
}
let position = match position {
InsertPosition::First => after_l_curly!(),
@ -533,7 +533,7 @@ impl ast::GenericParamList {
InsertPosition::After($anchor.syntax().clone().into())
}
};
};
}
let position = match self.generic_params().last() {
Some(it) => after_field!(it),