Merge chalk-rust-ir into chalk-solve

AzureMarker · AzureMarker · commit 81f76f681f8c · 2020-05-19T18:23:17.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,6 @@ chalk-macros = { version = "0.10.1-dev", path = "chalk-macros" }
 chalk-derive = { version = "0.10.1-dev", path = "chalk-derive" }
 chalk-engine = { version = "0.10.1-dev", path = "chalk-engine" }
 chalk-ir = { version = "0.10.1-dev", path = "chalk-ir" }
-chalk-rust-ir = { version = "0.10.1-dev", path = "chalk-rust-ir" }
 chalk-solve = { version = "0.10.1-dev", path = "chalk-solve" }
 chalk-parse = { version = "0.10.1-dev", path = "chalk-parse" }
 chalk-integration = { version = "0.10.1-dev", path = "chalk-integration" }
diff --git a/chalk-integration/Cargo.toml b/chalk-integration/Cargo.toml
@@ -17,6 +17,5 @@ chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }
 chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
 chalk-engine = { version = "0.10.1-dev", path = "../chalk-engine" }
 chalk-ir = { version = "0.10.1-dev", path = "../chalk-ir" }
-chalk-rust-ir = { version = "0.10.1-dev", path = "../chalk-rust-ir" }
 chalk-solve = { version = "0.10.1-dev", path = "../chalk-solve" }
 chalk-parse = { version = "0.10.1-dev", path = "../chalk-parse" }
diff --git a/chalk-integration/src/db.rs b/chalk-integration/src/db.rs
@@ -1,36 +1,21 @@
-use crate::error::ChalkError;
-use crate::interner::ChalkIr;
-use crate::lowering::LowerGoal;
-use crate::program::Program;
-use crate::query::{Lowering, LoweringDatabase};
-use crate::tls;
+use crate::{
+    error::ChalkError,
+    interner::ChalkIr,
+    lowering::LowerGoal,
+    program::Program,
+    query::{Lowering, LoweringDatabase},
+    tls,
+};
 use chalk_engine::forest::SubstitutionResult;
-use chalk_ir::AdtId;
-use chalk_ir::AssocTypeId;
-use chalk_ir::Canonical;
-use chalk_ir::ConstrainedSubst;
-use chalk_ir::Environment;
-use chalk_ir::FnDefId;
-use chalk_ir::GenericArg;
-use chalk_ir::Goal;
-use chalk_ir::ImplId;
-use chalk_ir::InEnvironment;
-use chalk_ir::OpaqueTyId;
-use chalk_ir::ProgramClause;
-use chalk_ir::TraitId;
-use chalk_ir::{ProgramClauses, UCanonical};
-use chalk_rust_ir::AdtDatum;
-use chalk_rust_ir::AssociatedTyDatum;
-use chalk_rust_ir::AssociatedTyValue;
-use chalk_rust_ir::AssociatedTyValueId;
-use chalk_rust_ir::FnDefDatum;
-use chalk_rust_ir::ImplDatum;
-use chalk_rust_ir::OpaqueTyDatum;
-use chalk_rust_ir::TraitDatum;
-use chalk_rust_ir::WellKnownTrait;
-use chalk_solve::RustIrDatabase;
-use chalk_solve::Solution;
-use chalk_solve::SolverChoice;
+use chalk_ir::{
+    AdtId, AssocTypeId, Canonical, ConstrainedSubst, Environment, FnDefId, GenericArg, Goal, ImplId,
+    InEnvironment, OpaqueTyId, ProgramClause, ProgramClauses, TraitId, UCanonical,
+};
+use chalk_solve::rust_ir::{
+    AdtDatum, AssociatedTyDatum, AssociatedTyValue, AssociatedTyValueId, FnDefDatum, ImplDatum,
+    OpaqueTyDatum, TraitDatum, WellKnownTrait,
+};
+use chalk_solve::{RustIrDatabase, Solution, SolverChoice};
 use salsa::Database;
 use std::sync::Arc;
 
diff --git a/chalk-integration/src/lowering.rs b/chalk-integration/src/lowering.rs
@@ -6,9 +6,8 @@ use chalk_ir::{
     QuantifiedWhereClauses, Substitution, ToGenericArg, TraitId,
 };
 use chalk_parse::ast::*;
-use chalk_rust_ir as rust_ir;
-use chalk_rust_ir::{
-    Anonymize, AssociatedTyValueId, IntoWhereClauses, OpaqueTyDatum, OpaqueTyDatumBound,
+use chalk_solve::rust_ir::{
+    self, Anonymize, AssociatedTyValueId, IntoWhereClauses, OpaqueTyDatum, OpaqueTyDatumBound,
 };
 use std::collections::{BTreeMap, HashSet};
 use std::sync::Arc;
diff --git a/chalk-integration/src/program.rs b/chalk-integration/src/program.rs
@@ -7,7 +7,7 @@ use chalk_ir::{
     Goal, Goals, ImplId, Lifetime, OpaqueTy, OpaqueTyId, ProgramClause, ProgramClauseImplication,
     ProgramClauses, ProjectionTy, Substitution, TraitId, Ty,
 };
-use chalk_rust_ir::{
+use chalk_solve::rust_ir::{
     AdtDatum, AssociatedTyDatum, AssociatedTyValue, AssociatedTyValueId, FnDefDatum, ImplDatum,
     ImplType, OpaqueTyDatum, TraitDatum, WellKnownTrait,
 };
diff --git a/chalk-rust-ir/Cargo.toml b/chalk-rust-ir/Cargo.toml
diff --git a/chalk-rust-ir/README.md b/chalk-rust-ir/README.md
diff --git a/chalk-solve/Cargo.toml b/chalk-solve/Cargo.toml
@@ -19,7 +19,6 @@ chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }
 chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
 chalk-engine = { version = "0.10.1-dev", path = "../chalk-engine" }
 chalk-ir = { version = "0.10.1-dev", path = "../chalk-ir" }
-chalk-rust-ir = { version = "0.10.1-dev", path = "../chalk-rust-ir" }
 
 [dev-dependencies]
 chalk-integration = { version = "0.10.1-dev", path = "../chalk-integration" }
diff --git a/chalk-solve/src/clauses/program_clauses.rs b/chalk-solve/src/clauses/program_clauses.rs
@@ -1,9 +1,9 @@
 use crate::clauses::builder::ClauseBuilder;
+use crate::rust_ir::*;
 use crate::split::Split;
 use chalk_ir::cast::{Cast, CastTo, Caster};
 use chalk_ir::interner::Interner;
 use chalk_ir::*;
-use chalk_rust_ir::*;
 use std::iter;
 
 /// Trait for lowering a given piece of rust-ir source (e.g., an impl
diff --git a/chalk-solve/src/coherence/solve.rs b/chalk-solve/src/coherence/solve.rs
@@ -1,11 +1,11 @@
 use crate::coherence::{CoherenceError, CoherenceSolver};
 use crate::ext::*;
+use crate::rust_ir::*;
 use crate::{goal_builder::GoalBuilder, Solution};
 use chalk_ir::cast::*;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::interner::Interner;
 use chalk_ir::*;
-use chalk_rust_ir::*;
 use itertools::Itertools;
 
 impl<I: Interner> CoherenceSolver<'_, I> {
diff --git a/chalk-solve/src/lib.rs b/chalk-solve/src/lib.rs
@@ -1,8 +1,8 @@
 #![deny(rust_2018_idioms)]
 
+use crate::rust_ir::*;
 use chalk_ir::interner::Interner;
 use chalk_ir::*;
-use chalk_rust_ir::*;
 use std::fmt::Debug;
 use std::sync::Arc;
 
@@ -20,6 +20,7 @@ pub mod ext;
 pub mod goal_builder;
 mod infer;
 pub mod recursive;
+pub mod rust_ir;
 mod solve;
 pub mod split;
 pub mod wf;
diff --git a/chalk-solve/src/rust_ir.rs b/chalk-solve/src/rust_ir.rs
diff --git a/chalk-solve/src/split.rs b/chalk-solve/src/split.rs
@@ -1,7 +1,7 @@
+use crate::rust_ir::*;
 use crate::RustIrDatabase;
 use chalk_ir::interner::Interner;
 use chalk_ir::*;
-use chalk_rust_ir::*;
 use std::sync::Arc;
 
 /// Methods for splitting up the projections for associated types from
diff --git a/chalk-solve/src/wf.rs b/chalk-solve/src/wf.rs
@@ -2,6 +2,7 @@ use std::{fmt, iter};
 
 use crate::ext::*;
 use crate::goal_builder::GoalBuilder;
+use crate::rust_ir::*;
 use crate::solve::SolverChoice;
 use crate::split::Split;
 use crate::RustIrDatabase;
@@ -10,7 +11,6 @@ use chalk_ir::fold::shift::Shift;
 use chalk_ir::interner::Interner;
 use chalk_ir::visit::{Visit, Visitor};
 use chalk_ir::*;
-use chalk_rust_ir::*;
 
 #[derive(Debug)]
 pub enum WfError<I: Interner> {
