Fix building

Author: jackh726

Cargo.lock

@@ -453,7 +453,7 @@ version = "0.10.1-dev"
 source = "git+https://github.com/rust-lang/chalk.git?rev=ea1ca4ddc43abcfed77420f294a3713fac714e18#ea1ca4ddc43abcfed77420f294a3713fac714e18"
 dependencies = [
  "chalk-derive",
- "lazy_static 1.4.0",
+ "lazy_static",
 ]
 
 [[package]]

src/librustc_traits/chalk/lowering.rs

@@ -572,7 +572,7 @@ impl<'tcx> LowerInto<'tcx, chalk_ir::Binders<chalk_ir::QuantifiedWhereClauses<Ru
                 chalk_ir::Binders::new(
                     chalk_ir::VariableKinds::new(interner),
                     chalk_ir::WhereClause::Implemented(chalk_ir::TraitRef {
-                        trait_id: chalk_ir::TraitId(*def_id),
+                        trait_id: chalk_ir::TraitId(def_id),
                         substitution: substs.lower_into(interner),
                     }),
                 )
@@ -581,7 +581,7 @@ impl<'tcx> LowerInto<'tcx, chalk_ir::Binders<chalk_ir::QuantifiedWhereClauses<Ru
             ty::ExistentialPredicate::AutoTrait(def_id) => chalk_ir::Binders::new(
                 chalk_ir::VariableKinds::new(interner),
                 chalk_ir::WhereClause::Implemented(chalk_ir::TraitRef {
-                    trait_id: chalk_ir::TraitId(*def_id),
+                    trait_id: chalk_ir::TraitId(def_id),
                     substitution: chalk_ir::Substitution::empty(interner),
                 }),
             ),

src/tools/tidy/src/deps.rs

@@ -79,7 +79,6 @@ const WHITELIST: &[&str] = &[
     "byteorder",
     "cc",
     "cfg-if",
-    "chalk-base",
     "chalk-derive",
     "chalk-ir",
     "cloudabi",