@@ -180,15 +180,15 @@ fn push_debuginfo_type_name<'tcx>(
180
180
if cpp_like_debuginfo {
181
181
output. push_str ( "array$<" ) ;
182
182
push_debuginfo_type_name ( tcx, inner_type, true , output, visited) ;
183
- match len. val ( ) {
183
+ match len. kind ( ) {
184
184
ty:: ConstKind :: Param ( param) => write ! ( output, ",{}>" , param. name) . unwrap ( ) ,
185
185
_ => write ! ( output, ",{}>" , len. eval_usize( tcx, ty:: ParamEnv :: reveal_all( ) ) )
186
186
. unwrap ( ) ,
187
187
}
188
188
} else {
189
189
output. push ( '[' ) ;
190
190
push_debuginfo_type_name ( tcx, inner_type, true , output, visited) ;
191
- match len. val ( ) {
191
+ match len. kind ( ) {
192
192
ty:: ConstKind :: Param ( param) => write ! ( output, "; {}]" , param. name) . unwrap ( ) ,
193
193
_ => write ! ( output, "; {}]" , len. eval_usize( tcx, ty:: ParamEnv :: reveal_all( ) ) )
194
194
. unwrap ( ) ,
@@ -679,7 +679,7 @@ fn push_generic_params_internal<'tcx>(
679
679
}
680
680
681
681
fn push_const_param < ' tcx > ( tcx : TyCtxt < ' tcx > , ct : ty:: Const < ' tcx > , output : & mut String ) {
682
- match ct. val ( ) {
682
+ match ct. kind ( ) {
683
683
ty:: ConstKind :: Param ( param) => {
684
684
write ! ( output, "{}" , param. name)
685
685
}
@@ -703,7 +703,7 @@ fn push_const_param<'tcx>(tcx: TyCtxt<'tcx>, ct: ty::Const<'tcx>, output: &mut S
703
703
// but we get a deterministic, virtually unique value for the constant.
704
704
let hcx = & mut tcx. create_stable_hashing_context ( ) ;
705
705
let mut hasher = StableHasher :: new ( ) ;
706
- hcx. while_hashing_spans ( false , |hcx| ct. val ( ) . hash_stable ( hcx, & mut hasher) ) ;
706
+ hcx. while_hashing_spans ( false , |hcx| ct. kind ( ) . hash_stable ( hcx, & mut hasher) ) ;
707
707
// Let's only emit 64 bits of the hash value. That should be plenty for
708
708
// avoiding collisions and will make the emitted type names shorter.
709
709
let hash: u64 = hasher. finish ( ) ;
0 commit comments