Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 01:38:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1379

Browse source 
1379: fix: clean up warnings r=matklad a=csmoe

r? @matklad 

Co-authored-by: csmoe <csmoe@msn.com>
This commit is contained in:
bors[bot] 2019-06-06 07:27:06 +00:00
commit b79e6294a6
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir/src/diagnostics.rs
View file

@ -87,7 +87,7 @@ impl Diagnostic for NoSuchField {
fn syntax_node_ptr(&self) -> SyntaxNodePtr {
self.field.into()
}
fn as_any(&self) -> &(Any + Send + 'static) {
fn as_any(&self) -> &(dyn Any + Send + 'static) {
self
}
}
@ -109,7 +109,7 @@ impl Diagnostic for UnresolvedModule {
fn syntax_node_ptr(&self) -> SyntaxNodePtr {
self.decl.into()
}
fn as_any(&self) -> &(Any + Send + 'static) {
fn as_any(&self) -> &(dyn Any + Send + 'static) {
self
}
}

2
crates/ra_mbe/src/syntax_bridge.rs
View file

@ -47,7 +47,7 @@ pub fn syntax_node_to_token_tree(node: &SyntaxNode) -> Option<(tt::Subtree, Toke
fn token_tree_to_syntax_node<F>(tt: &tt::Subtree, f: F) -> Result<TreeArc<SyntaxNode>, ExpandError>
where
F: Fn(&mut ra_parser::TokenSource, &mut ra_parser::TreeSink),
F: Fn(&mut dyn ra_parser::TokenSource, &mut dyn ra_parser::TreeSink),
{
let tokens = [tt.clone().into()];
let buffer = TokenBuffer::new(&tokens);

6
crates/ra_syntax/src/parsing/lexer/numbers.rs
View file

@ -16,7 +16,7 @@ pub(crate) fn scan_number(c: char, ptr: &mut Ptr) -> SyntaxKind {
ptr.bump();
scan_digits(ptr, true);
}
'0'...'9' | '_' | '.' | 'e' | 'E' => {
'0'..='9' | '_' | '.' | 'e' | 'E' => {
scan_digits(ptr, true);
}
_ => return INT_NUMBER,
@ -47,10 +47,10 @@ pub(crate) fn scan_number(c: char, ptr: &mut Ptr) -> SyntaxKind {
fn scan_digits(ptr: &mut Ptr, allow_hex: bool) {
while let Some(c) = ptr.current() {
match c {
'_' | '0'...'9' => {
'_' | '0'..='9' => {
ptr.bump();
}
'a'...'f' | 'A'...'F' if allow_hex => {
'a'..='f' | 'A'..='F' if allow_hex => {
ptr.bump();
}
_ => return,