Skip to content

Commit 24390f6

Browse files
committed
Auto merge of #137995 - hkBst:parse_format_reuse_unescape, r=nnethercote
Remove duplicate impl of string unescape from parse_format r? `@nnethercote`
2 parents 3732587 + 618c3de commit 24390f6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ impl ExprCollector<'_> {
224224

225225
curarg = parser.curarg;
226226

227-
let to_span = |inner_span: rustc_parse_format::InnerSpan| {
227+
let to_span = |inner_span: std::ops::Range<usize>| {
228228
is_direct_literal.then(|| {
229229
TextRange::new(
230230
inner_span.start.try_into().unwrap(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ pub(crate) fn parse(
214214
};
215215
}
216216

217-
let to_span = |inner_span: parse::InnerSpan| {
217+
let to_span = |inner_span: std::ops::Range<usize>| {
218218
is_source_literal.then(|| {
219219
TextRange::new(inner_span.start.try_into().unwrap(), inner_span.end.try_into().unwrap())
220220
})
@@ -297,7 +297,7 @@ pub(crate) fn parse(
297297
unfinished_literal.clear();
298298
}
299299

300-
let span = parser.arg_places.get(placeholder_index).and_then(|&s| to_span(s));
300+
let span = parser.arg_places.get(placeholder_index).and_then(|s| to_span(s.clone()));
301301
placeholder_index += 1;
302302

303303
let position_span = to_span(position_span);

0 commit comments

Comments
 (0)