@@ -280,14 +280,15 @@ mod test {
280
280
}
281
281
}
282
282
283
- fn assert_dynamic_through_type_is_info < T : Typed + TypedThrough > ( ) {
283
+ fn assert_dynamic_through_type_is_val_info < T : Typed + TypedThrough > ( ) {
284
284
let type_info = T :: type_info ( ) ;
285
285
let through_type_info = into_through_type_info ( type_info) ;
286
286
287
287
match through_type_info {
288
- ThroughTypeInfo :: TypeInfo ( info) => {
289
- assert_eq ! ( info. type_id( ) , type_info. type_id( ) ) ;
290
- assert_eq ! ( info. type_path( ) , type_info. type_path( ) ) ;
288
+ ThroughTypeInfo :: UntypedWrapper { through_type, wrapper_kind} => {
289
+ assert_eq ! ( wrapper_kind, UntypedWrapperKind :: Val ) ;
290
+ assert_eq ! ( through_type. type_id( ) , type_info. type_id( ) ) ;
291
+ assert_eq ! ( through_type. type_path( ) , type_info. type_path( ) ) ;
291
292
}
292
293
_ => panic ! ( "Expected ThroughTypeInfo::TypeInfo" ) ,
293
294
}
@@ -296,47 +297,47 @@ mod test {
296
297
#[ test]
297
298
fn test_typed_through_primitives ( ) {
298
299
assert_type_info_is_through :: < bool > ( ) ;
299
- assert_dynamic_through_type_is_info :: < bool > ( ) ;
300
+ assert_dynamic_through_type_is_val_info :: < bool > ( ) ;
300
301
assert_type_info_is_through :: < i8 > ( ) ;
301
- assert_dynamic_through_type_is_info :: < i8 > ( ) ;
302
+ assert_dynamic_through_type_is_val_info :: < i8 > ( ) ;
302
303
assert_type_info_is_through :: < i16 > ( ) ;
303
- assert_dynamic_through_type_is_info :: < i16 > ( ) ;
304
+ assert_dynamic_through_type_is_val_info :: < i16 > ( ) ;
304
305
assert_type_info_is_through :: < i32 > ( ) ;
305
- assert_dynamic_through_type_is_info :: < i32 > ( ) ;
306
+ assert_dynamic_through_type_is_val_info :: < i32 > ( ) ;
306
307
assert_type_info_is_through :: < i64 > ( ) ;
307
- assert_dynamic_through_type_is_info :: < i64 > ( ) ;
308
+ assert_dynamic_through_type_is_val_info :: < i64 > ( ) ;
308
309
assert_type_info_is_through :: < i128 > ( ) ;
309
- assert_dynamic_through_type_is_info :: < i128 > ( ) ;
310
+ assert_dynamic_through_type_is_val_info :: < i128 > ( ) ;
310
311
assert_type_info_is_through :: < u8 > ( ) ;
311
- assert_dynamic_through_type_is_info :: < u8 > ( ) ;
312
+ assert_dynamic_through_type_is_val_info :: < u8 > ( ) ;
312
313
assert_type_info_is_through :: < u16 > ( ) ;
313
- assert_dynamic_through_type_is_info :: < u16 > ( ) ;
314
+ assert_dynamic_through_type_is_val_info :: < u16 > ( ) ;
314
315
assert_type_info_is_through :: < u32 > ( ) ;
315
- assert_dynamic_through_type_is_info :: < u32 > ( ) ;
316
+ assert_dynamic_through_type_is_val_info :: < u32 > ( ) ;
316
317
assert_type_info_is_through :: < u64 > ( ) ;
317
- assert_dynamic_through_type_is_info :: < u64 > ( ) ;
318
+ assert_dynamic_through_type_is_val_info :: < u64 > ( ) ;
318
319
assert_type_info_is_through :: < u128 > ( ) ;
319
- assert_dynamic_through_type_is_info :: < u128 > ( ) ;
320
+ assert_dynamic_through_type_is_val_info :: < u128 > ( ) ;
320
321
assert_type_info_is_through :: < f32 > ( ) ;
321
- assert_dynamic_through_type_is_info :: < f32 > ( ) ;
322
+ assert_dynamic_through_type_is_val_info :: < f32 > ( ) ;
322
323
assert_type_info_is_through :: < f64 > ( ) ;
323
- assert_dynamic_through_type_is_info :: < f64 > ( ) ;
324
+ assert_dynamic_through_type_is_val_info :: < f64 > ( ) ;
324
325
assert_type_info_is_through :: < usize > ( ) ;
325
- assert_dynamic_through_type_is_info :: < usize > ( ) ;
326
+ assert_dynamic_through_type_is_val_info :: < usize > ( ) ;
326
327
assert_type_info_is_through :: < isize > ( ) ;
327
- assert_dynamic_through_type_is_info :: < isize > ( ) ;
328
+ assert_dynamic_through_type_is_val_info :: < isize > ( ) ;
328
329
assert_type_info_is_through :: < String > ( ) ;
329
- assert_dynamic_through_type_is_info :: < String > ( ) ;
330
+ assert_dynamic_through_type_is_val_info :: < String > ( ) ;
330
331
assert_type_info_is_through :: < PathBuf > ( ) ;
331
- assert_dynamic_through_type_is_info :: < PathBuf > ( ) ;
332
+ assert_dynamic_through_type_is_val_info :: < PathBuf > ( ) ;
332
333
assert_type_info_is_through :: < OsString > ( ) ;
333
- assert_dynamic_through_type_is_info :: < OsString > ( ) ;
334
+ assert_dynamic_through_type_is_val_info :: < OsString > ( ) ;
334
335
assert_type_info_is_through :: < char > ( ) ;
335
- assert_dynamic_through_type_is_info :: < char > ( ) ;
336
+ assert_dynamic_through_type_is_val_info :: < char > ( ) ;
336
337
assert_type_info_is_through :: < ReflectReference > ( ) ;
337
- assert_dynamic_through_type_is_info :: < ReflectReference > ( ) ;
338
+ assert_dynamic_through_type_is_val_info :: < ReflectReference > ( ) ;
338
339
assert_type_info_is_through :: < & ' static str > ( ) ;
339
- assert_dynamic_through_type_is_info :: < & ' static str > ( ) ;
340
+ assert_dynamic_through_type_is_val_info :: < & ' static str > ( ) ;
340
341
}
341
342
342
343
#[ test]
0 commit comments