Rollup of 7 pull requests

compiler/rustc_infer/src/traits/util.rs

@@ -1,5 +1,5 @@
 use rustc_data_structures::fx::FxHashSet;
-use rustc_middle::ty::{self, ToPolyTraitRef, TyCtxt};
+use rustc_middle::ty::{self, TyCtxt};
 use rustc_span::{Ident, Span};
 pub use rustc_type_ir::elaborate::*;
 
@@ -125,8 +125,8 @@ pub fn transitive_bounds_that_define_assoc_item<'tcx>(
  .iter_identity_copied()
  .map(|(clause, _)| clause.instantiate_supertrait(tcx, trait_ref))
  .filter_map(|clause| clause.as_trait_clause())
- // FIXME: Negative supertraits are elaborated here lol
- .map(|trait_pred| trait_pred.to_poly_trait_ref()),
+ .filter(|clause| clause.polarity() == ty::PredicatePolarity::Positive)
+ .map(|clause| clause.map_bound(|clause| clause.trait_ref)),
  );
 
  return Some(trait_ref);

compiler/rustc_middle/src/mir/coverage.rs

@@ -71,11 +71,7 @@ impl ConditionId {
 
 /// Enum that can hold a constant zero value, the ID of an physical coverage
 /// counter, or the ID of a coverage-counter expression.
-///
-/// This was originally only used for expression operands (and named `Operand`),
-/// but the zero/counter/expression distinction is also useful for representing
-/// the value of code/gap mappings, and the true/false arms of branch mappings.
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 #[derive(TyEncodable, TyDecodable, Hash, HashStable, TypeFoldable, TypeVisitable)]
 pub enum CovTerm {
  Zero,
@@ -171,7 +167,7 @@ impl Op {
  }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 #[derive(TyEncodable, TyDecodable, Hash, HashStable, TypeFoldable, TypeVisitable)]
 pub struct Expression {
  pub lhs: CovTerm,

compiler/rustc_middle/src/ty/mod.rs

@@ -79,8 +79,7 @@ pub use self::predicate::{
  PolyExistentialPredicate, PolyExistentialProjection, PolyExistentialTraitRef,
  PolyProjectionPredicate, PolyRegionOutlivesPredicate, PolySubtypePredicate, PolyTraitPredicate,
  PolyTraitRef, PolyTypeOutlivesPredicate, Predicate, PredicateKind, ProjectionPredicate,
- RegionOutlivesPredicate, SubtypePredicate, ToPolyTraitRef, TraitPredicate, TraitRef,
- TypeOutlivesPredicate,
+ RegionOutlivesPredicate, SubtypePredicate, TraitPredicate, TraitRef, TypeOutlivesPredicate,
 };
 pub use self::region::{
  BoundRegion, BoundRegionKind, EarlyParamRegion, LateParamRegion, LateParamRegionKind, Region,

compiler/rustc_middle/src/ty/predicate.rs

@@ -476,16 +476,6 @@ impl<'tcx> Clause<'tcx> {
  }
 }
 
-pub trait ToPolyTraitRef<'tcx> {
- fn to_poly_trait_ref(&self) -> PolyTraitRef<'tcx>;
-}
-
-impl<'tcx> ToPolyTraitRef<'tcx> for PolyTraitPredicate<'tcx> {
- fn to_poly_trait_ref(&self) -> PolyTraitRef<'tcx> {
- self.map_bound_ref(|trait_pred| trait_pred.trait_ref)
- }
-}
-
 impl<'tcx> UpcastFrom<TyCtxt<'tcx>, PredicateKind<'tcx>> for Predicate<'tcx> {
  fn upcast_from(from: PredicateKind<'tcx>, tcx: TyCtxt<'tcx>) -> Self {
  ty::Binder::dummy(from).upcast(tcx)