rust-lang · bors · Jan 26, 2023 · Jan 9, 2023 · Jan 12, 2023 · Jan 14, 2023
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@@ -79,6 79,7 @@ use std::path::PathBuf;
 use std::{cmp, fmt, iter};
 
 mod note;
 mod note_and_explain;
 mod suggest;
 
 pub(crate) mod need_type_info;
@@ -1846,7 1847,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
  }
 
  self.check_and_note_conflicting_crates(diag, terr);
- self.tcx.note_and_explain_type_err(diag, terr, cause, span, cause.body_id.to_def_id());
 
  self.note_and_explain_type_err(diag, terr, cause, span, cause.body_id.to_def_id());
 
  if let Some(ValuePairs::PolyTraitRefs(exp_found)) = values
  && let ty::Closure(def_id, _) = exp_found.expected.skip_binder().self_ty().kind()

diff --git a/compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs b/compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs
diff --git a/compiler/rustc_middle/src/ty/assoc.rs b/compiler/rustc_middle/src/ty/assoc.rs
@@ -130,7 130,7 @@ impl std::fmt::Display for AssocKind {
 /// done only on items with the same name.
 #[derive(Debug, Clone, PartialEq, HashStable)]
 pub struct AssocItems<'tcx> {
- pub(super) items: SortedIndexMultiMap<u32, Symbol, &'tcx ty::AssocItem>,
  items: SortedIndexMultiMap<u32, Symbol, &'tcx ty::AssocItem>,
 }
 
 impl<'tcx> AssocItems<'tcx> {

diff --git a/compiler/rustc_middle/src/ty/error.rs b/compiler/rustc_middle/src/ty/error.rs
diff --git a/compiler/rustc_middle/src/ty/query.rs b/compiler/rustc_middle/src/ty/query.rs
@@ -441,6 441,10 @@ impl<'tcx> TyCtxt<'tcx> {
  self.opt_def_kind(def_id)
  .unwrap_or_else(|| bug!("def_kind: unsupported node: {:?}", def_id))
  }
 
  pub fn bound_type_of(self, def_id: impl IntoQueryParam<DefId>) -> ty::EarlyBinder<Ty<'tcx>> {
  ty::EarlyBinder(self.type_of(def_id))
  }
 }
 
 impl<'tcx> TyCtxtAt<'tcx> {
@@ -449,4 453,8 @@ impl<'tcx> TyCtxtAt<'tcx> {
  self.opt_def_kind(def_id)
  .unwrap_or_else(|| bug!("def_kind: unsupported node: {:?}", def_id))
  }
 
  pub fn bound_type_of(self, def_id: impl IntoQueryParam<DefId>) -> ty::EarlyBinder<Ty<'tcx>> {
  ty::EarlyBinder(self.type_of(def_id))
  }
 }
diff --git a/compiler/rustc_middle/src/ty/util.rs b/compiler/rustc_middle/src/ty/util.rs
@@ -3,7 3,6 @@
 use crate::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use crate::mir;
 use crate::ty::layout::IntegerExt;
-use crate::ty::query::TyCtxtAt;
 use crate::ty::{
  self, DefIdTree, FallibleTypeFolder, Ty, TyCtxt, TypeFoldable, TypeFolder, TypeSuperFoldable,
  TypeVisitable,
@@ -637,10 636,6 @@ impl<'tcx> TyCtxt<'tcx> {
  if visitor.found_recursion { Err(expanded_type) } else { Ok(expanded_type) }
  }
 
- pub fn bound_type_of(self, def_id: DefId) -> ty::EarlyBinder<Ty<'tcx>> {
- ty::EarlyBinder(self.type_of(def_id))
- }
-
  pub fn bound_return_position_impl_trait_in_trait_tys(
  self,
  def_id: DefId,
@@ -738,12 733,6 @@ impl<'tcx> TyCtxt<'tcx> {
  }
 }
 
-impl<'tcx> TyCtxtAt<'tcx> {
- pub fn bound_type_of(self, def_id: DefId) -> ty::EarlyBinder<Ty<'tcx>> {
- ty::EarlyBinder(self.type_of(def_id))
- }
-}
-
 struct OpaqueTypeExpander<'tcx> {
  // Contains the DefIds of the opaque types that are currently being
  // expanded. When we expand an opaque type we insert the DefId of

diff --git a/tests/ui/associated-types/defaults-in-other-trait-items.rs b/tests/ui/associated-types/defaults-in-other-trait-items.rs
@@ -44,4 44,18 @@ impl AssocConst for () {
  const C: Self::Ty = 0u8;
 }
 
 pub trait Trait {
  type Res = isize; //~ NOTE associated type defaults can't be assumed inside the trait defining them
 
  fn infer_me_correctly() -> Self::Res {
  //~^ NOTE expected `<Self as Trait>::Res` because of return type
 
  // {integer} == isize
  2
  //~^ ERROR mismatched types
  //~| NOTE expected associated type, found integer
  //~| NOTE expected associated type `<Self as Trait>::Res`
  }
 }
 
 fn main() {}
diff --git a/tests/ui/associated-types/defaults-in-other-trait-items.stderr b/tests/ui/associated-types/defaults-in-other-trait-items.stderr
@@ -24,6 24,21 @@ LL | const C: Self::Ty = 0u8;
  = note: expected associated type `<Self as AssocConst>::Ty`
  found type `u8`
 
-error: aborting due to 2 previous errors
 error[E0308]: mismatched types
  --> $DIR/defaults-in-other-trait-items.rs:54:9
  |
 LL | type Res = isize;
  | ----------------- associated type defaults can't be assumed inside the trait defining them
 LL |
 LL | fn infer_me_correctly() -> Self::Res {
  | --------- expected `<Self as Trait>::Res` because of return type
 ...
 LL | 2
  | ^ expected associated type, found integer
  |
  = note: expected associated type `<Self as Trait>::Res`
  found type `{integer}`
 
 error: aborting due to 3 previous errors
 
 For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/associated-types/issue-26681.stderr b/tests/ui/associated-types/issue-26681.stderr
@@ -1,13 1,13 @@
 error[E0308]: mismatched types
  --> $DIR/issue-26681.rs:17:39
  |
 LL | type Fv: Foo = u8;
  | ------------------ associated type defaults can't be assumed inside the trait defining them
 LL | const C: <Self::Fv as Foo>::Bar = 6665;
  | ^^^^ expected associated type, found integer
  |
  = note: expected associated type `<<Self as Baz>::Fv as Foo>::Bar`
  found type `{integer}`
- = help: consider constraining the associated type `<<Self as Baz>::Fv as Foo>::Bar` to `{integer}`
- = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
 
 error: aborting due to previous error