diff --git a/crates/ra_hir/src/diagnostics.rs b/crates/ra_hir/src/diagnostics.rs index 4b7b2dbee7..2557ef18e3 100644 --- a/crates/ra_hir/src/diagnostics.rs +++ b/crates/ra_hir/src/diagnostics.rs @@ -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 } } diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index 9d3d2ad5bc..cb039ca376 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs @@ -47,7 +47,7 @@ pub fn syntax_node_to_token_tree(node: &SyntaxNode) -> Option<(tt::Subtree, Toke fn token_tree_to_syntax_node(tt: &tt::Subtree, f: F) -> Result, 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); diff --git a/crates/ra_syntax/src/parsing/lexer/numbers.rs b/crates/ra_syntax/src/parsing/lexer/numbers.rs index 7f6abe1d5c..874fb8b320 100644 --- a/crates/ra_syntax/src/parsing/lexer/numbers.rs +++ b/crates/ra_syntax/src/parsing/lexer/numbers.rs @@ -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,