Skip to content

Commit fef4174

Browse files
committed
remove format!
1 parent 2b915b0 commit fef4174

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/definitions.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl<T: Clone + std::fmt::Debug> DefinitionsBuilder<T> {
5656
let next_id = self.definitions.len();
5757
match self.definitions.entry(reference.clone()) {
5858
Entry::Occupied(mut entry) => match entry.get_mut().value.replace(value) {
59-
Some(_) => py_err!(format!("Duplicate ref: `{reference}`")),
59+
Some(_) => py_err!("Duplicate ref: `{}`", reference),
6060
None => Ok(entry.get().id),
6161
},
6262
Entry::Vacant(entry) => {
@@ -74,17 +74,14 @@ impl<T: Clone + std::fmt::Debug> DefinitionsBuilder<T> {
7474
pub fn get_definition(&self, reference_id: ReferenceId) -> PyResult<&T> {
7575
let (reference, def) = match self.definitions.iter().find(|(_, def)| def.id == reference_id) {
7676
Some(v) => v,
77-
None => {
78-
return py_err!(format!(
79-
"Definitions error: no definition for ReferenceId `{reference_id}`"
80-
))
81-
}
77+
None => return py_err!("Definitions error: no definition for ReferenceId `{}`", reference_id),
8278
};
8379
match def.value.as_ref() {
8480
Some(v) => Ok(v),
85-
None => py_err!(format!(
86-
"Definitions error: attempted to use `{reference}` before it was filled"
87-
)),
81+
None => py_err!(
82+
"Definitions error: attempted to use `{}` before it was filled",
83+
reference
84+
),
8885
}
8986
}
9087

@@ -94,7 +91,7 @@ impl<T: Clone + std::fmt::Debug> DefinitionsBuilder<T> {
9491
let mut defs: Vec<(usize, T)> = Vec::new();
9592
for (reference, def) in self.definitions.into_iter() {
9693
match def.value {
97-
None => return py_err!(format!("Definitions error: definition {reference} was never filled")),
94+
None => return py_err!("Definitions error: definition {} was never filled", reference),
9895
Some(v) => defs.push((def.id, v)),
9996
}
10097
}

0 commit comments

Comments
 (0)