mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #122377 - zetanumbers:discriminant_kind_copypaste_fix, r=oli-obk

Browse Source 
Fix discriminant_kind copy paste from the pointee trait case

r? `@oli-obk`
This commit is contained in:
Jubilee 2024-03-12 09:04:03 -07:00 committed by GitHub
commit bca8c62776
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_trait_selection/src/traits/project.rs
View File

@ -1061,8 +1061,9 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
// Integers and floats always have `u8` as their discriminant. // Integers and floats always have `u8` as their discriminant.
| ty::Infer(ty::InferTy::IntVar(_) | ty::InferTy::FloatVar(..)) => true, | ty::Infer(ty::InferTy::IntVar(_) | ty::InferTy::FloatVar(..)) => true,
// type parameters, opaques, and unnormalized projections have pointer // type parameters, opaques, and unnormalized projections don't have
// metadata if they're known (e.g. by the param_env) to be sized // a known discriminant and may need to be normalized further or rely
// on param env for discriminant projections
ty::Param(_) ty::Param(_)
| ty::Alias(..) | ty::Alias(..)
| ty::Bound(..) | ty::Bound(..)