Merge pull request #22440 from github/rust-analyzer-update-tweaks

Rust: rust-analyzer update tweaks

Author: redsun82

rust/extractor/src/main.rs

@@ -64,12 +64,11 @@ impl<'a> Extractor<'a> {
 
         let before_extract = Instant::now();
         let line_index = LineIndex::new(text.as_ref());
-        let display_path = file.to_string_lossy();
         let mut trap = self.traps.create("source", file);
         let label = trap.emit_file(file);
         let mut translator = translate::Translator::new(
             trap,
-            display_path.as_ref(),
+            file,
             label,
             line_index,
             semantics_info.as_ref().ok(),
@@ -98,7 +97,7 @@ impl<'a> Extractor<'a> {
         translator.trap.commit().unwrap_or_else(|err| {
             error!(
                 "Failed to write trap file for: {}: {}",
-                display_path,
+                file.display(),
                 err.to_string()
             )
         });

rust/extractor/src/translate/base.rs

@@ -21,6 +21,7 @@ use ra_ap_syntax::{
 use ra_ap_syntax_bridge::{
     DocCommentDesugarMode, syntax_node_to_token_tree, token_tree_to_syntax_node,
 };
+use std::path::{Path, PathBuf};
 
 impl Emission<ast::Item> for Translator<'_> {
     fn pre_emit(&mut self, node: &ast::Item) -> Option<Label<generated::Item>> {
@@ -125,7 +126,7 @@ pub enum SourceKind {
 
 pub struct Translator<'db> {
     pub trap: TrapFile,
-    path: String,
+    path: PathBuf,
     label: Label<generated::File>,
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
@@ -147,15 +148,15 @@ const DIAGNOSTIC_LIMIT_PER_FILE: usize = 100;
 impl<'db> Translator<'db> {
     pub fn new(
         trap: TrapFile,
-        path: &str,
+        path: &Path,
         label: Label<generated::File>,
         line_index: LineIndex,
         semantic_info: Option<&FileSemanticInformation<'db>>,
         source_kind: SourceKind,
     ) -> Translator<'db> {
         Translator {
             trap,
-            path: path.to_owned(),
+            path: path.to_path_buf(),
             label,
             line_index,
             file_id: semantic_info.map(|i| i.file_id),
@@ -293,7 +294,7 @@ impl<'db> Translator<'db> {
         dispatch_to_tracing!(
             severity,
             "{}:{}:{}: {}",
-            self.path,
+            self.path.display(),
             start.line + 1,
             start.col + 1,
             &full_message,

rust/extractor/src/translate/format_args.rs

@@ -56,21 +56,21 @@ pub(crate) fn reconstruct(
     input: &tt::TopSubtree,
     call_site: Span,
 ) -> Option<tt::TopSubtree> {
-    let (writer, content) = split_arguments(wrap, input)?;
     let emitter = Emitter {
         call_site,
         format_args_parens: input.view().top_subtree().delimiter,
     };
 
     let mut builder = tt::TopSubtreeBuilder::new(tt::Delimiter::invisible_spanned(call_site));
     match wrap {
-        Wrap::Bare => emitter.push_format_args(&mut builder, content),
+        Wrap::Bare => emitter.push_format_args(&mut builder, input.view().token_trees()),
         Wrap::Call(path) => {
             emitter.push_path(&mut builder, path);
-            emitter.push_parenthesized_format_args(&mut builder, content);
+            emitter.push_parenthesized_format_args(&mut builder, input.view().token_trees());
         }
         Wrap::WriteMethod => {
-            builder.extend_with_tt(writer.expect("write! split always yields a writer"));
+            let (writer, content) = split_arguments(input)?;
+            builder.extend_with_tt(writer);
             builder.push(emitter.punct('.', tt::Spacing::Alone));
             builder.push(emitter.ident("write_fmt"));
             emitter.push_parenthesized_format_args(&mut builder, content);
@@ -82,12 +82,8 @@ pub(crate) fn reconstruct(
 /// Splits the macro argument list into the leading writer (for `write!`/`writeln!`,
 /// everything up to the first top-level comma) and the format arguments.
 fn split_arguments<'a>(
-    wrap: Wrap,
     input: &'a tt::TopSubtree,
-) -> Option<(Option<tt::TokenTreesView<'a>>, tt::TokenTreesView<'a>)> {
-    if wrap != Wrap::WriteMethod {
-        return Some((None, input.view().token_trees()));
-    }
+) -> Option<(tt::TokenTreesView<'a>, tt::TokenTreesView<'a>)> {
     let mut iter = input.view().iter();
     let start = iter.savepoint();
     let mut found_comma = false;
@@ -105,7 +101,7 @@ fn split_arguments<'a>(
     }
     let writer = iter.from_savepoint(start);
     iter.next(); // consume the comma
-    Some((Some(writer), iter.remaining()))
+    Some((writer, iter.remaining()))
 }
 
 /// Emits the synthesized tokens, tagging them with the macro call site span.