rust-analyzer: Use pre-1.58.0 format strings.


(adam)

$NetBSD: patch-crates_hir__expand_src_builtin__fn__macro.rs,v 1.1 2022/02/14 08:27:17 adam Exp $

Use pre-1.58.0 format strings.

--- crates/hir_expand/src/builtin_fn_macro.rs.orig	2022-02-14 08:20:47.000000000 +0000
+++ crates/hir_expand/src/builtin_fn_macro.rs
@@ -452,11 +452,11 @@ fn relative_file(
     let call_site = call_id.as_file().original_file(db);
     let path = AnchoredPath { anchor: call_site, path: path_str };
     let res = db.resolve_path(path).ok_or_else(|| {
-        mbe::ExpandError::Other(format!("failed to load file `{path_str}`").into())
+        mbe::ExpandError::Other(format!("failed to load file `{}`", path_str).into())
     })?;
     // Prevent include itself
     if res == call_site && !allow_recursion {
-        Err(mbe::ExpandError::Other(format!("recursive inclusion of `{path_str}`").into()))
+        Err(mbe::ExpandError::Other(format!("recursive inclusion of `{}`", path_str).into()))
     } else {
         Ok(res)
     }

$NetBSD: patch-crates_ide__completion_src_completions_fn__param.rs,v 1.1 2022/02/14 08:27:17 adam Exp $

Use pre-1.58.0 format strings.

--- crates/ide_completion/src/completions/fn_param.rs.orig	2022-02-14 08:22:58.000000000 +0000
+++ crates/ide_completion/src/completions/fn_param.rs
@@ -45,7 +45,7 @@ pub(crate) fn complete_fn_param(acc: &mu
         ParamKind::Closure(closure) => {
             let stmt_list = closure.syntax().ancestors().find_map(ast::StmtList::cast)?;
             params_from_stmt_list_scope(ctx, stmt_list, |name, ty| {
-                add_new_item_to_acc(&format!("{name}: {ty}"), name.to_string());
+                add_new_item_to_acc(&format!("{}: {}", name, ty), name.to_string());
             });
         }
     }
@@ -94,7 +94,7 @@ fn fill_fn_params(
 
     if let Some(stmt_list) = function.syntax().parent().and_then(ast::StmtList::cast) {
         params_from_stmt_list_scope(ctx, stmt_list, |name, ty| {
-            file_params.entry(format!("{name}: {ty}")).or_insert(name.to_string());
+            file_params.entry(format!("{}: {}", name, ty)).or_insert(name.to_string());
         });
     }
 

$NetBSD: patch-crates_mbe_src_expander_matcher.rs,v 1.1 2022/02/14 08:27:17 adam Exp $

Use pre-1.58.0 format strings.

--- crates/mbe/src/expander/matcher.rs.orig	2022-02-14 08:16:44.000000000 +0000
+++ crates/mbe/src/expander/matcher.rs
@@ -657,7 +657,7 @@ fn match_loop(pattern: &MetaTemplate, sr
 fn match_leaf(lhs: &tt::Leaf, src: &mut TtIter) -> Result<(), ExpandError> {
     let rhs = src
         .expect_leaf()
-        .map_err(|()| ExpandError::BindingError(format!("expected leaf: `{lhs}`").into()))?;
+        .map_err(|()| ExpandError::BindingError(format!("expected leaf: `{}`", lhs).into()))?;
     match (lhs, rhs) {
         (
             tt::Leaf::Punct(tt::Punct { char: lhs, .. }),

$NetBSD: patch-crates_mbe_src_expander_transcriber.rs,v 1.1 2022/02/14 08:27:17 adam Exp $

Use pre-1.58.0 format strings.

--- crates/mbe/src/expander/transcriber.rs.orig	2022-02-14 08:17:53.000000000 +0000
+++ crates/mbe/src/expander/transcriber.rs
@@ -21,28 +21,28 @@ impl Bindings {
         }
 
         let mut b: &Binding =
-            self.inner.get(name).ok_or_else(|| binding_err!("could not find binding `{name}`"))?;
+            self.inner.get(name).ok_or_else(|| binding_err!("could not find binding `{}`", name))?;
         for nesting_state in nesting.iter_mut() {
             nesting_state.hit = true;
             b = match b {
                 Binding::Fragment(_) => break,
                 Binding::Nested(bs) => bs.get(nesting_state.idx).ok_or_else(|| {
                     nesting_state.at_end = true;
-                    binding_err!("could not find nested binding `{name}`")
+                    binding_err!("could not find nested binding `{}`", name)
                 })?,
                 Binding::Empty => {
                     nesting_state.at_end = true;
-                    return Err(binding_err!("could not find empty binding `{name}`"));
+                    return Err(binding_err!("could not find empty binding `{}`", name));
                 }
             };
         }
         match b {
             Binding::Fragment(it) => Ok(it),
             Binding::Nested(_) => {
-                Err(binding_err!("expected simple binding, found nested binding `{name}`"))
+                Err(binding_err!("expected simple binding, found nested binding `{}`", name))
             }
             Binding::Empty => {
-                Err(binding_err!("expected simple binding, found empty binding `{name}`"))
+                Err(binding_err!("expected simple binding, found empty binding `{}`", name))
             }
         }
     }

$NetBSD: patch-crates_mbe_src_tt__iter.rs,v 1.1 2022/02/14 08:27:17 adam Exp $

Use pre-1.58.0 format strings.

--- crates/mbe/src/tt_iter.rs.orig	2022-02-14 08:19:00.000000000 +0000
+++ crates/mbe/src/tt_iter.rs
@@ -106,7 +106,7 @@ impl<'a> TtIter<'a> {
         }
 
         let err = if error || !cursor.is_root() {
-            Some(ExpandError::BindingError(format!("expected {entry_point:?}").into()))
+            Some(ExpandError::BindingError(format!("expected {:?}", entry_point).into()))
         } else {
             None
         };

$NetBSD: patch-crates_project__model_src_rustc__cfg.rs,v 1.1 2022/02/14 08:27:17 adam Exp $

Use pre-1.58.0 format strings.

--- crates/project_model/src/rustc_cfg.rs.orig	2022-02-14 08:19:52.000000000 +0000
+++ crates/project_model/src/rustc_cfg.rs
@@ -29,7 +29,7 @@ pub(crate) fn get(cargo_toml: Option<&Ma
             );
             res.extend(rustc_cfgs.lines().filter_map(|it| it.parse().ok()));
         }
-        Err(e) => tracing::error!("failed to get rustc cfgs: {e:?}"),
+        Err(e) => tracing::error!("failed to get rustc cfgs: {:?}", e),
     }
 
     res
@@ -47,7 +47,7 @@ fn get_rust_cfgs(cargo_toml: Option<&Man
         }
         match utf8_stdout(cargo_config) {
             Ok(it) => return Ok(it),
-            Err(e) => tracing::debug!("{e:?}: falling back to querying rustc for cfgs"),
+            Err(e) => tracing::debug!("{:?}: falling back to querying rustc for cfgs", e),
         }
     }
     // using unstable cargo features failed, fall back to using plain rustc