Skip to content

Commit

Permalink
Rollup merge of #122377 - zetanumbers:discriminant_kind_copypaste_fix…
Browse files Browse the repository at this point in the history
…, r=oli-obk

Fix discriminant_kind copy paste from the pointee trait case

r? `@oli-obk`
  • Loading branch information
workingjubilee committed Mar 12, 2024
2 parents 0b31375 + 5336a02 commit bca8c62
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions compiler/rustc_trait_selection/src/traits/project.rs
Expand Up @@ -1061,8 +1061,9 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
// Integers and floats always have `u8` as their discriminant.
| ty::Infer(ty::InferTy::IntVar(_) | ty::InferTy::FloatVar(..)) => true,

// type parameters, opaques, and unnormalized projections have pointer
// metadata if they're known (e.g. by the param_env) to be sized
// type parameters, opaques, and unnormalized projections don't have
// a known discriminant and may need to be normalized further or rely
// on param env for discriminant projections
ty::Param(_)
| ty::Alias(..)
| ty::Bound(..)
Expand Down

0 comments on commit bca8c62

Please sign in to comment.