bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs')
-rw-r--r--crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
index 80f6d85a3d..47555a5db2 100644
--- a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
+++ b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
@@ -11,10 +11,10 @@ use std::{
use intern::Symbol;
use proc_macro::bridge::{self, server};
-use span::{Span, FIXUP_ERASED_FILE_AST_ID_MARKER};
+use span::{FIXUP_ERASED_FILE_AST_ID_MARKER, Span};
use tt::{TextRange, TextSize};
-use crate::server_impl::{literal_kind_to_internal, token_stream::TokenStreamBuilder, TopSubtree};
+use crate::server_impl::{TopSubtree, literal_kind_to_internal, token_stream::TokenStreamBuilder};
mod tt {
pub use tt::*;
@@ -207,7 +207,7 @@ impl server::TokenStream for RaSpanServer {
base: Option<Self::TokenStream>,
trees: Vec<bridge::TokenTree<Self::TokenStream, Self::Span, Self::Symbol>>,
) -> Self::TokenStream {
- let mut builder = TokenStreamBuilder::new();
+ let mut builder = TokenStreamBuilder::default();
if let Some(base) = base {
builder.push(base);
}
@@ -222,7 +222,7 @@ impl server::TokenStream for RaSpanServer {
base: Option<Self::TokenStream>,
streams: Vec<Self::TokenStream>,
) -> Self::TokenStream {
- let mut builder = TokenStreamBuilder::new();
+ let mut builder = TokenStreamBuilder::default();
if let Some(base) = base {
builder.push(base);
}
@@ -415,7 +415,7 @@ impl server::Server for RaSpanServer {
#[cfg(test)]
mod tests {
- use span::{EditionedFileId, FileId, SyntaxContextId};
+ use span::{EditionedFileId, FileId, SyntaxContext};
use super::*;
@@ -427,7 +427,7 @@ mod tests {
file_id: EditionedFileId::current_edition(FileId::from_raw(0)),
ast_id: span::ErasedFileAstId::from_raw(0),
},
- ctx: SyntaxContextId::root(span::Edition::CURRENT),
+ ctx: SyntaxContext::root(span::Edition::CURRENT),
};
let s = TokenStream {
token_trees: vec![
@@ -469,7 +469,7 @@ mod tests {
file_id: EditionedFileId::current_edition(FileId::from_raw(0)),
ast_id: span::ErasedFileAstId::from_raw(0),
},
- ctx: SyntaxContextId::root(span::Edition::CURRENT),
+ ctx: SyntaxContext::root(span::Edition::CURRENT),
};
let subtree_paren_a = vec![
tt::TokenTree::Subtree(tt::Subtree {