@@ -53,13 +53,10 @@ impl Extensions {
53
53
self . inner . insert ( id, a) ;
54
54
}
55
55
56
- fn set_ext_wrapper < T : Any + Send + Sync + std:: fmt:: Debug + ' static > (
57
- & mut self ,
58
- t : ExtWrapper < T > ,
59
- ) {
56
+ fn set_ext_wrapped < T : Any + Send + Sync + std:: fmt:: Debug + ' static > ( & mut self , t : T ) {
60
57
let id = TypeId :: of :: < T > ( ) ;
61
- // println!("inserting: {id:?}: {}", std::any::type_name::<T>());
62
- let a = Arc :: new ( t ) ;
58
+ //println!("inserting: {id:?}: {}", std::any::type_name::<T>());
59
+ let a = Arc :: new ( ExtWrapper :: new ( t ) ) ;
63
60
self . inner . insert ( id, a) ;
64
61
}
65
62
@@ -211,17 +208,10 @@ mod test {
211
208
#[ test]
212
209
fn equality_ext_wrapper ( ) {
213
210
let mut exts1 = Extensions :: default ( ) ;
214
- let wrapped1 = ExtWrapper :: new ( 0 ) ;
215
- let t1 = wrapped1. type_id ( ) ;
216
- println ! ( "type id of ExtWrapper<i32>: {t1:?}" ) ;
217
- exts1. set_ext_wrapper ( wrapped1) ;
211
+ exts1. set_ext_wrapped ( 0 ) ;
218
212
219
213
let mut exts2 = Extensions :: default ( ) ;
220
- let wrapped2 = ExtWrapper :: new ( 1 ) ;
221
- let t2 = wrapped2. type_id ( ) ;
222
- println ! ( "type id of ExtWrapper<i32>: {t2:?}" ) ;
223
-
224
- exts2. set_ext_wrapper ( wrapped2) ;
214
+ exts2. set_ext_wrapped ( 1 ) ;
225
215
226
216
assert_eq ! (
227
217
exts1, exts2,
@@ -232,8 +222,7 @@ mod test {
232
222
) ;
233
223
234
224
let mut exts3 = Extensions :: default ( ) ;
235
- let wrapped3 = ExtWrapper :: new ( 0 ) ;
236
- exts3. set_ext_wrapper ( wrapped3) ;
225
+ exts3. set_ext_wrapped ( 0 ) ;
237
226
238
227
assert_eq ! ( exts1, exts3, "extensions of type ExtWrapper are equal" ) ;
239
228
}
@@ -260,14 +249,12 @@ mod test {
260
249
let mut exts = Extensions :: default ( ) ;
261
250
262
251
println ! ( "validate ExtWrapper<i32> with value 0" ) ;
263
- let wrapped = ExtWrapper :: new ( 0i32 ) ;
264
- exts. set_ext_wrapper ( wrapped) ;
252
+ exts. set_ext_wrapped ( 0i32 ) ;
265
253
let expected = exts. get_ext :: < i32 > ( ) . expect ( "must get a value" ) ;
266
254
assert_eq ! ( 0 , * expected, "return the same instance we just added" ) ;
267
255
268
256
println ! ( "validate replacing previous ExtWrapper<i32> with value 1" ) ;
269
- let wrapped = ExtWrapper :: new ( 1i32 ) ;
270
- exts. set_ext_wrapper ( wrapped) ;
257
+ exts. set_ext_wrapped ( 1i32 ) ;
271
258
let expected = exts. get_ext :: < i32 > ( ) . expect ( "must get a value" ) ;
272
259
assert_eq ! ( 1 , * expected, "return the same instance we just added" ) ;
273
260
}
0 commit comments