Rename chalk-macros to chalk-engine-base and consolidate base types

AzureMarker · AzureMarker · commit 896f786a4075 · 2020-05-19T18:23:33.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ salsa = "0.10.0"
 serde = "1.0"
 serde_derive = "1.0"
 
-chalk-macros = { version = "0.10.1-dev", path = "chalk-macros" }
+chalk-engine-base = { version = "0.10.1-dev", path = "chalk-engine-base" }
 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" }
diff --git a/chalk-derive/src/lib.rs b/chalk-derive/src/lib.rs
@@ -235,7 +235,7 @@ fn derive_zip(mut s: synstructure::Structure) -> TokenStream {
     });
 
     // when the two variants are different
-    quote!((_, _)  => Err(::chalk_engine::fallible::NoSolution)).to_tokens(&mut body);
+    quote!((_, _)  => Err(::chalk_engine_base::results::NoSolution)).to_tokens(&mut body);
 
     s.add_bounds(synstructure::AddBounds::None);
     s.bound_impl(
@@ -246,7 +246,7 @@ fn derive_zip(mut s: synstructure::Structure) -> TokenStream {
                 zipper: &mut Z,
                  a: &Self,
                  b: &Self,
-            ) -> ::chalk_engine::fallible::Fallible<()>
+            ) -> ::chalk_engine_base::results::Fallible<()>
             where
                 #interner: 'i,
                 {
@@ -316,7 +316,7 @@ fn derive_fold(mut s: synstructure::Structure) -> TokenStream {
                 &self,
                 folder: &mut dyn ::chalk_ir::fold::Folder < 'i, #interner, #target_interner >,
                 outer_binder: ::chalk_ir::DebruijnIndex,
-            ) -> ::chalk_engine::fallible::Fallible<Self::Result>
+            ) -> ::chalk_engine_base::results::Fallible<Self::Result>
             where
                 #interner: 'i,
                 #target_interner: 'i,
diff --git a/chalk-engine-base/Cargo.toml b/chalk-engine-base/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "chalk-macros"
+name = "chalk-engine-base"
 version = "0.10.1-dev"
-description = "Macros for Chalk"
+description = "Base types for Chalk logic engines"
 license = "Apache-2.0/MIT"
 authors = ["Rust Compiler Team", "Chalk developers"]
 repository = "https://github.com/rust-lang/chalk"
diff --git a/chalk-engine-base/README.md b/chalk-engine-base/README.md
@@ -1,3 +1,3 @@
-Various macros used within Chalk.
+Base types used by the SLG and recursive solvers.
 
 See [Github](https://github.com/rust-lang/chalk) for up-to-date information.
diff --git a/chalk-engine-base/src/lib.rs b/chalk-engine-base/src/lib.rs
@@ -0,0 +1,8 @@
+#[macro_use]
+extern crate lazy_static;
+
+#[macro_use]
+mod macros;
+pub mod results;
+
+pub use macros::*;
diff --git a/chalk-engine-base/src/macros/index.rs b/chalk-engine-base/src/macros/index.rs
diff --git a/chalk-engine-base/src/macros/mod.rs b/chalk-engine-base/src/macros/mod.rs
@@ -1,9 +1,5 @@
 use std::cell::RefCell;
 
-#[macro_use]
-extern crate lazy_static;
-
-#[macro_use]
 mod index;
 
 lazy_static! {
diff --git a/chalk-engine-base/src/results.rs b/chalk-engine-base/src/results.rs
@@ -6,3 +6,8 @@ pub type Fallible<T> = Result<T, NoSolution>;
 /// cannot be performed.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct NoSolution;
+
+/// Error type for the `UnificationOps::program_clauses` method --
+/// indicates that the complete set of program clauses for this goal
+/// cannot be enumerated.
+pub struct Floundered;
diff --git a/chalk-engine/Cargo.toml b/chalk-engine/Cargo.toml
@@ -15,4 +15,4 @@ default = []
 [dependencies]
 rustc-hash = { version = "1.1.0" }
 
-chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }
+chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
diff --git a/chalk-engine/src/context.rs b/chalk-engine/src/context.rs
@@ -5,9 +5,9 @@
 //! `DomainGoal` type, add arena lifetime parameters, and more. See
 //! [`Context`] trait for a list of types.
 
-use crate::fallible::Fallible;
 use crate::hh::HhGoal;
 use crate::{CompleteAnswer, ExClause};
+use chalk_engine_base::results::{Fallible, Floundered};
 use std::fmt::Debug;
 use std::hash::Hash;
 
@@ -282,11 +282,6 @@ pub trait AggregateOps<C: Context> {
 /// other operations on terms.
 pub trait InferenceTable<C: Context>: ResolventOps<C> + TruncateOps<C> + UnificationOps<C> {}
 
-/// Error type for the `UnificationOps::program_clauses` method --
-/// indicates that the complete set of program clauses for this goal
-/// cannot be enumerated.
-pub struct Floundered;
-
 /// Methods for unifying and manipulating terms and binders.
 pub trait UnificationOps<C: Context> {
     // Used by: simplify
diff --git a/chalk-engine/src/lib.rs b/chalk-engine/src/lib.rs
@@ -54,15 +54,14 @@
 //!   Popularized by Lambda Prolog.
 
 #[macro_use]
-extern crate chalk_macros;
+extern crate chalk_engine_base;
 
 use crate::context::Context;
 use std::cmp::min;
 use std::usize;
 
 pub mod context;
 mod derived;
-pub mod fallible;
 pub mod forest;
 pub mod hh;
 mod logic;
diff --git a/chalk-engine/src/logic.rs b/chalk-engine/src/logic.rs
@@ -1,7 +1,6 @@
 use crate::context::{
-    Context, ContextOps, Floundered, InferenceTable, ResolventOps, TruncateOps, UnificationOps,
+    Context, ContextOps, InferenceTable, ResolventOps, TruncateOps, UnificationOps,
 };
-use crate::fallible::NoSolution;
 use crate::forest::Forest;
 use crate::hh::HhGoal;
 use crate::stack::{Stack, StackIndex};
@@ -10,6 +9,7 @@ use crate::table::AnswerIndex;
 use crate::{
     Answer, CompleteAnswer, ExClause, FlounderedSubgoal, Literal, Minimums, TableIndex, TimeStamp,
 };
+use chalk_engine_base::results::{Floundered, NoSolution};
 
 type RootSearchResult<T> = Result<T, RootSearchFail>;
 
diff --git a/chalk-engine/src/simplify.rs b/chalk-engine/src/simplify.rs
@@ -1,8 +1,8 @@
 use crate::context::{Context, ContextOps, InferenceTable};
-use crate::fallible::Fallible;
 use crate::forest::Forest;
 use crate::hh::HhGoal;
 use crate::{ExClause, Literal, TimeStamp};
+use chalk_engine_base::results::Fallible;
 
 impl<C: Context> Forest<C> {
     /// Simplifies an HH goal into a series of positive domain goals
diff --git a/chalk-integration/Cargo.toml b/chalk-integration/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 string_cache = "0.8.0"
 salsa = "0.10.0"
 
-chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }
+chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
 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" }
diff --git a/chalk-integration/src/lib.rs b/chalk-integration/src/lib.rs
@@ -2,7 +2,7 @@
 #![cfg_attr(feature = "bench", feature(test))]
 
 #[macro_use]
-extern crate chalk_macros;
+extern crate chalk_engine_base;
 
 pub mod db;
 pub mod error;
diff --git a/chalk-ir/Cargo.toml b/chalk-ir/Cargo.toml
@@ -10,6 +10,6 @@ keywords = ["compiler", "traits", "prolog"]
 edition = "2018"
 
 [dependencies]
-chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }
+chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
 chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
 chalk-engine = { version = "0.10.1-dev", path = "../chalk-engine" }
diff --git a/chalk-ir/src/fold/boring_impls.rs b/chalk-ir/src/fold/boring_impls.rs
@@ -224,7 +224,7 @@ macro_rules! copy_fold {
                 &self,
                 _folder: &mut dyn ($crate::fold::Folder<'i, I, TI>),
                 _outer_binder: DebruijnIndex,
-            ) -> ::chalk_engine::fallible::Fallible<Self::Result>
+            ) -> ::chalk_engine_base::results::Fallible<Self::Result>
             where
                 I: 'i,
                 TI: 'i,
@@ -263,7 +263,7 @@ macro_rules! id_fold {
                 &self,
                 _folder: &mut dyn ($crate::fold::Folder<'i, I, TI>),
                 _outer_binder: DebruijnIndex,
-            ) -> ::chalk_engine::fallible::Fallible<Self::Result>
+            ) -> ::chalk_engine_base::results::Fallible<Self::Result>
             where
                 I: 'i,
                 TI: 'i,
@@ -288,7 +288,7 @@ impl<I: Interner, TI: TargetInterner<I>> SuperFold<I, TI> for ProgramClauseData<
         &self,
         folder: &mut dyn Folder<'i, I, TI>,
         outer_binder: DebruijnIndex,
-    ) -> ::chalk_engine::fallible::Fallible<Self::Result>
+    ) -> ::chalk_engine_base::results::Fallible<Self::Result>
     where
         I: 'i,
         TI: 'i,
@@ -309,7 +309,7 @@ impl<I: Interner, TI: TargetInterner<I>> SuperFold<I, TI> for ProgramClause<I> {
         &self,
         folder: &mut dyn Folder<'i, I, TI>,
         outer_binder: DebruijnIndex,
-    ) -> ::chalk_engine::fallible::Fallible<Self::Result>
+    ) -> ::chalk_engine_base::results::Fallible<Self::Result>
     where
         I: 'i,
         TI: 'i,
@@ -328,7 +328,7 @@ impl<I: Interner, TI: TargetInterner<I>> Fold<I, TI> for PhantomData<I> {
         &self,
         _folder: &mut dyn Folder<'i, I, TI>,
         _outer_binder: DebruijnIndex,
-    ) -> ::chalk_engine::fallible::Fallible<Self::Result>
+    ) -> ::chalk_engine_base::results::Fallible<Self::Result>
     where
         I: 'i,
         TI: 'i,
diff --git a/chalk-ir/src/lib.rs b/chalk-ir/src/lib.rs
@@ -8,7 +8,7 @@ use crate::fold::shift::Shift;
 use crate::fold::{Fold, Folder, Subst, SuperFold};
 use crate::visit::{SuperVisit, Visit, VisitExt, VisitResult, Visitor};
 use chalk_derive::{Fold, HasInterner, SuperVisit, Visit, Zip};
-use chalk_engine::fallible::*;
+use chalk_engine_base::results::*;
 use std::iter;
 use std::marker::PhantomData;
 
diff --git a/chalk-solve/Cargo.toml b/chalk-solve/Cargo.toml
@@ -15,7 +15,7 @@ itertools = "0.9.0"
 petgraph = "0.5.0"
 rustc-hash = { version = "1.0.0" }
 
-chalk-macros = { version = "0.10.1-dev", path = "../chalk-macros" }
+chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
 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" }
diff --git a/chalk-solve/src/clauses.rs b/chalk-solve/src/clauses.rs
@@ -3,7 +3,7 @@ use self::env_elaborator::elaborate_env_clauses;
 use self::program_clauses::ToProgramClauses;
 use crate::split::Split;
 use crate::RustIrDatabase;
-use chalk_engine::context::Floundered;
+use chalk_engine_base::results::Floundered;
 use chalk_ir::cast::Cast;
 use chalk_ir::could_match::CouldMatch;
 use chalk_ir::interner::Interner;
diff --git a/chalk-solve/src/clauses/generalize.rs b/chalk-solve/src/clauses/generalize.rs
@@ -6,7 +6,7 @@
 //! happen with `dyn Trait` currently; that's the only case where we use the
 //! types passed to `program_clauses` in the clauses we generate.
 
-use chalk_engine::fallible::Fallible;
+use chalk_engine_base::results::Fallible;
 use chalk_ir::{
     fold::{Fold, Folder},
     interner::{HasInterner, Interner},
diff --git a/chalk-solve/src/infer/canonicalize.rs b/chalk-solve/src/infer/canonicalize.rs
@@ -1,4 +1,4 @@
-use chalk_engine::fallible::*;
+use chalk_engine_base::results::*;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::{HasInterner, Interner};
diff --git a/chalk-solve/src/infer/invert.rs b/chalk-solve/src/infer/invert.rs
@@ -1,4 +1,4 @@
-use chalk_engine::fallible::*;
+use chalk_engine_base::results::*;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::HasInterner;
diff --git a/chalk-solve/src/infer/normalize_deep.rs b/chalk-solve/src/infer/normalize_deep.rs
@@ -1,4 +1,4 @@
-use chalk_engine::fallible::*;
+use chalk_engine_base::results::*;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::Interner;
diff --git a/chalk-solve/src/infer/ucanonicalize.rs b/chalk-solve/src/infer/ucanonicalize.rs
@@ -1,4 +1,4 @@
-use chalk_engine::fallible::*;
+use chalk_engine_base::results::*;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::{HasInterner, Interner};
 use chalk_ir::visit::{Visit, Visitor};
diff --git a/chalk-solve/src/infer/unify.rs b/chalk-solve/src/infer/unify.rs
@@ -1,7 +1,7 @@
 use super::var::*;
 use super::*;
 use crate::infer::instantiate::IntoBindersAndValue;
-use chalk_engine::fallible::*;
+use chalk_engine_base::results::*;
 use chalk_ir::cast::Cast;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::{HasInterner, Interner};
diff --git a/chalk-solve/src/lib.rs b/chalk-solve/src/lib.rs
@@ -7,7 +7,7 @@ use std::fmt::Debug;
 use std::sync::Arc;
 
 #[macro_use]
-extern crate chalk_macros;
+extern crate chalk_engine_base;
 
 #[cfg(test)]
 #[macro_use]
diff --git a/chalk-solve/src/recursive.rs b/chalk-solve/src/recursive.rs
@@ -1,17 +1,19 @@
-use super::*;
-
 mod fulfill;
 mod search_graph;
 mod stack;
 
 use self::fulfill::Fulfill;
 use self::search_graph::{DepthFirstNumber, SearchGraph};
 use self::stack::{Stack, StackDepth};
-use chalk_engine::{
-    context::Floundered,
-    fallible::{Fallible, NoSolution},
+use crate::clauses::program_clauses_for_goal;
+use crate::{Guidance, RustIrDatabase, Solution};
+use chalk_engine_base::results::{Fallible, Floundered, NoSolution};
+use chalk_ir::interner::Interner;
+use chalk_ir::{
+    Binders, Canonical, ClausePriority, ConstrainedSubst, DomainGoal, Environment, Goal, GoalData,
+    InEnvironment, Parameter, ParameterKinds, ProgramClause, ProgramClauseData,
+    ProgramClauseImplication, UCanonical,
 };
-use clauses::program_clauses_for_goal;
 use rustc_hash::FxHashMap;
 
 type UCanonicalGoal<I> = UCanonical<InEnvironment<Goal<I>>>;
diff --git a/chalk-solve/src/recursive/fulfill.rs b/chalk-solve/src/recursive/fulfill.rs
diff --git a/chalk-solve/src/recursive/search_graph.rs b/chalk-solve/src/recursive/search_graph.rs
diff --git a/chalk-solve/src/solve/slg.rs b/chalk-solve/src/solve/slg.rs
diff --git a/chalk-solve/src/solve/slg/resolvent.rs b/chalk-solve/src/solve/slg/resolvent.rs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-Various macros used within Chalk.`
	`1`	`+Base types used by the SLG and recursive solvers.`
`2`	`2`
`3`	`3`	`See [Github](https://github.com/rust-lang/chalk) for up-to-date information.`