commit 618c3de1464089e617db2faa32f081fe63c1cb75
author Marijn Schouten <mhkbst@gmail.com> Wed Feb 19 11:41:31 2025 +0100
committer Marijn Schouten <mhkbst@gmail.com> Tue May 06 10:00:22 2025 +0000
tree c495a4b214454af18d357cc184e47d74b1dc87b5
parent 712e178a6d6d2cf81f480d1bc26ae0b8300052e0

Remove duplicate impl of string unescape

crates/hir-def/src/expr_store/lower/asm.rs

diff --git a/crates/hir-def/src/expr_store/lower/asm.rs b/crates/hir-def/src/expr_store/lower/asm.rs
index 9ef0306..d36e520 100644
--- a/crates/hir-def/src/expr_store/lower/asm.rs
+++ b/crates/hir-def/src/expr_store/lower/asm.rs
@@ -224,7 +224,7 @@
 
                     curarg = parser.curarg;
 
-                    let to_span = |inner_span: rustc_parse_format::InnerSpan| {
+                    let to_span = |inner_span: std::ops::Range<usize>| {
                         is_direct_literal.then(|| {
                             TextRange::new(
                                 inner_span.start.try_into().unwrap(),

crates/hir-def/src/hir/format_args.rs

diff --git a/crates/hir-def/src/hir/format_args.rs b/crates/hir-def/src/hir/format_args.rs
index 2fd21bb..f27a406 100644
--- a/crates/hir-def/src/hir/format_args.rs
+++ b/crates/hir-def/src/hir/format_args.rs
@@ -214,7 +214,7 @@
         };
     }
 
-    let to_span = |inner_span: parse::InnerSpan| {
+    let to_span = |inner_span: std::ops::Range<usize>| {
         is_source_literal.then(|| {
             TextRange::new(inner_span.start.try_into().unwrap(), inner_span.end.try_into().unwrap())
         })
@@ -297,7 +297,7 @@
                     unfinished_literal.clear();
                 }
 
-                let span = parser.arg_places.get(placeholder_index).and_then(|&s| to_span(s));
+                let span = parser.arg_places.get(placeholder_index).and_then(|s| to_span(s.clone()));
                 placeholder_index += 1;
 
                 let position_span = to_span(position_span);