enable default bounds

rust-lang · Feb 8, 2024 · 3f57f13 · 3f57f13
1 parent 70506d2
commit 3f57f13
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 130 deletions.
diff --git a/compiler/rustc_hir_analysis/src/astconv/bounds.rs b/compiler/rustc_hir_analysis/src/astconv/bounds.rs
@@ -49,9 +49,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
  let tcx = self.tcx();
  let trait_id = tcx.lang_items().get(trait_);
 
- if self.check_for_implicit_trait(trait_id, ast_bounds, self_ty_where_predicates)
- && (trait_ == hir::LangItem::Sized || tcx.features().default_auto_traits)
- {
+ if self.check_for_implicit_trait(trait_id, ast_bounds, self_ty_where_predicates) {
  // There was no `?Trait` or `!Trait` bound;
  // add `Trait` if it's available.
  bounds.push_lang_item_trait(tcx, self_ty, trait_, span);

diff --git a/compiler/rustc_hir_analysis/src/astconv/object_safety.rs b/compiler/rustc_hir_analysis/src/astconv/object_safety.rs
@@ -54,13 +54,11 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
  }
  }
  // FIXME: support polarity for trait objects
- if tcx.features().default_auto_traits {
- hir::lang_items::DEFAULT_TRAITS.iter().for_each(|default_trait| {
- if *default_trait != hir::LangItem::Sized {
- bounds.push_lang_item_trait(tcx, dummy_self, *default_trait, span);
- }
- });
- }
+ hir::lang_items::DEFAULT_TRAITS.iter().for_each(|default_trait| {
+ if *default_trait != hir::LangItem::Sized {
+ bounds.push_lang_item_trait(tcx, dummy_self, *default_trait, span);
+ }
+ });
 
  let mut trait_bounds = vec![];
  let mut projection_bounds = vec![];

diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -14,7 +14,7 @@ use std::path::{Path, PathBuf};
 // #73494.
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
-const ISSUES_ENTRY_LIMIT: usize = 1819;
+const ISSUES_ENTRY_LIMIT: usize = 1816;
 const ROOT_ENTRY_LIMIT: usize = 871;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[

diff --git a/tests/ui/issues/issue-29147-rpass.rs b/tests/ui/issues/issue-29147-rpass.rs
diff --git a/tests/ui/issues/issue-29147.rs b/tests/ui/issues/issue-29147.rs
diff --git a/tests/ui/issues/issue-29147.stderr b/tests/ui/issues/issue-29147.stderr
diff --git a/tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.rs b/tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.rs
diff --git a/tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.stderr b/tests/ui/traits/next-solver/cycles/coinduction/fixpoint-exponential-growth.stderr