From dcb0c02e3afa8e163379b56a943f04e6e4879dd6 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 14 Jul 2019 19:40:19 +0200
Subject: Remove blacklist, instead mark `Sized` as non-enumerable

This seems to be enough to prevent hanging in rust-analyzer, Chalk and the rustc
repo.
---
 crates/ra_hir/src/ty/traits/chalk.rs | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs
index 203ec3b1b..9e7ae0724 100644
--- a/crates/ra_hir/src/ty/traits/chalk.rs
+++ b/crates/ra_hir/src/ty/traits/chalk.rs
@@ -276,11 +276,6 @@ impl ToChalk for Arc<super::TraitEnvironment> {
                 // for env, we just ignore errors
                 continue;
             }
-            if let GenericPredicate::Implemented(trait_ref) = pred {
-                if blacklisted_trait(db, trait_ref.trait_) {
-                    continue;
-                }
-            }
             clauses.push(pred.clone().to_chalk(db).cast());
         }
         chalk_ir::Environment::new().add_clauses(clauses)
@@ -322,10 +317,10 @@ fn make_binders<T>(value: T, num_vars: usize) -> chalk_ir::Binders<T> {
     }
 }
 
-fn blacklisted_trait(db: &impl HirDatabase, trait_: Trait) -> bool {
+fn is_non_enumerable_trait(db: &impl HirDatabase, trait_: Trait) -> bool {
     let name = trait_.name(db).unwrap_or_else(crate::Name::missing).to_string();
     match &*name {
-        "Send" | "Sync" | "Sized" | "Fn" | "FnMut" | "FnOnce" => true,
+        "Sized" => true,
         _ => false,
     }
 }
@@ -343,11 +338,6 @@ fn convert_where_clauses(
             // anyway), otherwise Chalk can easily get into slow situations
             return vec![pred.clone().subst(substs).to_chalk(db)];
         }
-        if let GenericPredicate::Implemented(trait_ref) = pred {
-            if blacklisted_trait(db, trait_ref.trait_) {
-                continue;
-            }
-        }
         result.push(pred.clone().subst(substs).to_chalk(db));
     }
     result
@@ -375,10 +365,6 @@ where
             return Vec::new();
         }
         let trait_: Trait = from_chalk(self.db, trait_id);
-        let blacklisted = blacklisted_trait(self.db, trait_);
-        if blacklisted {
-            return Vec::new();
-        }
         let result: Vec<_> = self
             .db
             .impls_for_trait(self.krate, trait_)
@@ -477,8 +463,8 @@ pub(crate) fn trait_datum_query(
     let flags = chalk_rust_ir::TraitFlags {
         auto: trait_.is_auto(db),
         upstream: trait_.module(db).krate(db) != Some(krate),
+        non_enumerable: is_non_enumerable_trait(db, trait_),
         // FIXME set these flags correctly
-        non_enumerable: false,
         marker: false,
         fundamental: false,
     };
-- 
cgit v1.2.3