diff options
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | src/librustc_traits/chalk/lowering.rs | 4 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0adb499a620..be516677b52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -459,7 +459,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]] diff --git a/src/librustc_traits/chalk/lowering.rs b/src/librustc_traits/chalk/lowering.rs index 1f9444df428..af245d81926 100644 --- a/src/librustc_traits/chalk/lowering.rs +++ b/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), }), ), diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index aec6b5d2523..093db2a49d0 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -79,7 +79,6 @@ const WHITELIST: &[&str] = &[ "byteorder", "cc", "cfg-if", - "chalk-base", "chalk-derive", "chalk-ir", "cloudabi", |