Auto merge of #137995 - hkBst:parse_format_reuse_unescape, r=nnethercote

Remove duplicate impl of string unescape from parse_format
r? `@nnethercote`

Author: bors

compiler/rustc_builtin_macros/src/format.rs

@@ -1,3 +1,5 @@
+use std::ops::Range;
+
 use parse::Position::ArgumentNamed;
 use rustc_ast::ptr::P;
 use rustc_ast::tokenstream::TokenStream;
@@ -335,7 +337,7 @@ fn make_format_args(
 returnExpandResult::Ready(Err(guar));
 }
 
-let to_span = |inner_span:parse::InnerSpan| {
+let to_span = |inner_span:Range<usize>| {
  is_source_literal.then(|| {
  fmt_span.from_inner(InnerSpan{start: inner_span.start,end: inner_span.end})
 })
@@ -407,7 +409,7 @@ fn make_format_args(
 letmut placeholder_index = 0;
 
 for piece in&pieces {
-match*piece {
+match piece.clone(){
  parse::Piece::Lit(s) => {
  unfinished_literal.push_str(s);
 }
@@ -417,7 +419,8 @@ fn make_format_args(
  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);
@@ -609,7 +612,7 @@ fn make_format_args(
 fninvalid_placeholder_type_error(
 ecx:&ExtCtxt<'_>,
 ty:&str,
-ty_span:Option<parse::InnerSpan>,
+ty_span:Option<Range<usize>>,
 fmt_span:Span,
 ){
 let sp = ty_span.map(|sp| fmt_span.from_inner(InnerSpan::new(sp.start, sp.end)));