@@ -56,7 +56,7 @@ impl<T: Clone + std::fmt::Debug> DefinitionsBuilder<T> {
56
56
let next_id = self . definitions . len ( ) ;
57
57
match self . definitions . entry ( reference. clone ( ) ) {
58
58
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 ) ,
60
60
None => Ok ( entry. get ( ) . id ) ,
61
61
} ,
62
62
Entry :: Vacant ( entry) => {
@@ -74,17 +74,14 @@ impl<T: Clone + std::fmt::Debug> DefinitionsBuilder<T> {
74
74
pub fn get_definition ( & self , reference_id : ReferenceId ) -> PyResult < & T > {
75
75
let ( reference, def) = match self . definitions . iter ( ) . find ( |( _, def) | def. id == reference_id) {
76
76
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) ,
82
78
} ;
83
79
match def. value . as_ref ( ) {
84
80
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
+ ) ,
88
85
}
89
86
}
90
87
@@ -94,7 +91,7 @@ impl<T: Clone + std::fmt::Debug> DefinitionsBuilder<T> {
94
91
let mut defs: Vec < ( usize , T ) > = Vec :: new ( ) ;
95
92
for ( reference, def) in self . definitions . into_iter ( ) {
96
93
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 ) ,
98
95
Some ( v) => defs. push ( ( def. id , v) ) ,
99
96
}
100
97
}
0 commit comments