From f854a29c9adcfeaa7164928ff91daab9ca9a063c Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 6 Jul 2019 17:43:13 +0200 Subject: Make EnumVariant a GenericDef and simplify some code --- crates/ra_hir/src/ty/traits/chalk.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'crates/ra_hir/src/ty/traits') diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs index 2a0537bc3..4c3744b44 100644 --- a/crates/ra_hir/src/ty/traits/chalk.rs +++ b/crates/ra_hir/src/ty/traits/chalk.rs @@ -428,11 +428,7 @@ pub(crate) fn struct_datum_query( CallableDef::Struct(s) => s.module(db).krate(db), CallableDef::EnumVariant(v) => v.parent_enum(db).module(db).krate(db), } != Some(krate); - let generic_def: GenericDef = match callable { - CallableDef::Function(f) => f.into(), - CallableDef::Struct(s) => s.into(), - CallableDef::EnumVariant(v) => v.parent_enum(db).into(), - }; + let generic_def: GenericDef = callable.into(); let generic_params = generic_def.generic_params(db); let bound_vars = Substs::bound_vars(&generic_params); let where_clauses = convert_where_clauses(db, generic_def, &bound_vars); -- cgit v1.2.3