Rename chalk-engine-base to chalk-base

Author: AzureMarker

Cargo.lock

@@ -21,7 +21,7 @@ salsa = "0.10.0"
 serde = "1.0"
 serde_derive = "1.0"
 
-chalk-engine-base = { version = "0.10.1-dev", path = "chalk-engine-base" }
+chalk-base = { version = "0.10.1-dev", path = "chalk-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" }

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "chalk-engine-base"
+name = "chalk-base"
 version = "0.10.1-dev"
 description = "Base types for Chalk logic engines"
 license = "Apache-2.0/MIT"

chalk-engine-base/Cargo.toml renamed to chalk-base/Cargo.toml

@@ -235,7 +235,7 @@ fn derive_zip(mut s: synstructure::Structure) -> TokenStream {
     });
 
     // when the two variants are different
-    quote!((_, _)  => Err(::chalk_engine_base::results::NoSolution)).to_tokens(&mut body);
+    quote!((_, _)  => Err(::chalk_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_base::results::Fallible<()>
+            ) -> ::chalk_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_base::results::Fallible<Self::Result>
+            ) -> ::chalk_base::results::Fallible<Self::Result>
             where
                 #interner: 'i,
                 #target_interner: 'i,

chalk-engine-base/README.md renamed to chalk-base/README.md

@@ -15,4 +15,4 @@ default = []
 [dependencies]
 rustc-hash = { version = "1.1.0" }
 
-chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
+chalk-base = { version = "0.10.1-dev", path = "../chalk-base" }

chalk-engine-base/src/lib.rs renamed to chalk-base/src/lib.rs

@@ -7,7 +7,7 @@
 
 use crate::hh::HhGoal;
 use crate::{CompleteAnswer, ExClause};
-use chalk_engine_base::results::{Fallible, Floundered};
+use chalk_base::results::{Fallible, Floundered};
 use std::fmt::Debug;
 use std::hash::Hash;
 

chalk-engine-base/src/macros/index.rs renamed to chalk-base/src/macros/index.rs

@@ -54,7 +54,7 @@
 //!   Popularized by Lambda Prolog.
 
 #[macro_use]
-extern crate chalk_engine_base;
+extern crate chalk_base;
 
 use crate::context::Context;
 use std::cmp::min;

chalk-engine-base/src/macros/mod.rs renamed to chalk-base/src/macros/mod.rs

@@ -9,7 +9,7 @@ use crate::table::AnswerIndex;
 use crate::{
     Answer, CompleteAnswer, ExClause, FlounderedSubgoal, Literal, Minimums, TableIndex, TimeStamp,
 };
-use chalk_engine_base::results::{Floundered, NoSolution};
+use chalk_base::results::{Floundered, NoSolution};
 
 type RootSearchResult<T> = Result<T, RootSearchFail>;
 

chalk-engine-base/src/results.rs renamed to chalk-base/src/results.rs

@@ -2,7 +2,7 @@ use crate::context::{Context, ContextOps, InferenceTable};
 use crate::forest::Forest;
 use crate::hh::HhGoal;
 use crate::{ExClause, Literal, TimeStamp};
-use chalk_engine_base::results::Fallible;
+use chalk_base::results::Fallible;
 
 impl<C: Context> Forest<C> {
     /// Simplifies an HH goal into a series of positive domain goals

chalk-derive/src/lib.rs

@@ -13,7 +13,7 @@ publish = false
 string_cache = "0.8.0"
 salsa = "0.10.0"
 
-chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
+chalk-base = { version = "0.10.1-dev", path = "../chalk-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" }

chalk-engine/Cargo.toml

@@ -8,8 +8,8 @@ use crate::{
 };
 use chalk_engine::forest::SubstitutionResult;
 use chalk_ir::{
-    AdtId, AssocTypeId, Canonical, ConstrainedSubst, Environment, FnDefId, GenericArg, Goal, ImplId,
-    InEnvironment, OpaqueTyId, ProgramClause, ProgramClauses, TraitId, UCanonical,
+    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,

chalk-engine/src/context.rs

@@ -2,7 +2,7 @@
 #![cfg_attr(feature = "bench", feature(test))]
 
 #[macro_use]
-extern crate chalk_engine_base;
+extern crate chalk_base;
 
 pub mod db;
 pub mod error;

chalk-engine/src/lib.rs

@@ -10,7 +10,7 @@ keywords = ["compiler", "traits", "prolog"]
 edition = "2018"
 
 [dependencies]
-chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
+chalk-base = { version = "0.10.1-dev", path = "../chalk-base" }
 chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
 chalk-engine = { version = "0.10.1-dev", path = "../chalk-engine", optional = true }
 

chalk-engine/src/logic.rs

@@ -225,7 +225,7 @@ macro_rules! copy_fold {
                 &self,
                 _folder: &mut dyn ($crate::fold::Folder<'i, I, TI>),
                 _outer_binder: DebruijnIndex,
-            ) -> ::chalk_engine_base::results::Fallible<Self::Result>
+            ) -> ::chalk_base::results::Fallible<Self::Result>
             where
                 I: 'i,
                 TI: 'i,
@@ -267,7 +267,7 @@ macro_rules! id_fold {
                 &self,
                 _folder: &mut dyn ($crate::fold::Folder<'i, I, TI>),
                 _outer_binder: DebruijnIndex,
-            ) -> ::chalk_engine_base::results::Fallible<Self::Result>
+            ) -> ::chalk_base::results::Fallible<Self::Result>
             where
                 I: 'i,
                 TI: 'i,
@@ -292,7 +292,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_base::results::Fallible<Self::Result>
+    ) -> ::chalk_base::results::Fallible<Self::Result>
     where
         I: 'i,
         TI: 'i,
@@ -313,7 +313,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_base::results::Fallible<Self::Result>
+    ) -> ::chalk_base::results::Fallible<Self::Result>
     where
         I: 'i,
         TI: 'i,
@@ -332,7 +332,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_base::results::Fallible<Self::Result>
+    ) -> ::chalk_base::results::Fallible<Self::Result>
     where
         I: 'i,
         TI: 'i,

chalk-engine/src/simplify.rs

@@ -7,8 +7,8 @@ use crate::cast::{Cast, CastTo};
 use crate::fold::shift::Shift;
 use crate::fold::{Fold, Folder, Subst, SuperFold};
 use crate::visit::{SuperVisit, Visit, VisitExt, VisitResult, Visitor};
+use chalk_base::results::*;
 use chalk_derive::{Fold, HasInterner, SuperVisit, Visit, Zip};
-use chalk_engine_base::results::*;
 use std::iter;
 use std::marker::PhantomData;
 

chalk-integration/Cargo.toml

@@ -15,7 +15,7 @@ itertools = "0.9.0"
 petgraph = "0.5.0"
 rustc-hash = { version = "1.0.0" }
 
-chalk-engine-base = { version = "0.10.1-dev", path = "../chalk-engine-base" }
+chalk-base = { version = "0.10.1-dev", path = "../chalk-base" }
 chalk-derive = { version = "0.10.1-dev", path = "../chalk-derive" }
 chalk-engine = { version = "0.10.1-dev", path = "../chalk-engine", optional = true }
 chalk-ir = { version = "0.10.1-dev", path = "../chalk-ir", default-features = false }

chalk-integration/src/db.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_base::results::Floundered;
+use chalk_base::results::Floundered;
 use chalk_ir::cast::Cast;
 use chalk_ir::could_match::CouldMatch;
 use chalk_ir::interner::Interner;

chalk-integration/src/lib.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_base::results::Fallible;
+use chalk_base::results::Fallible;
 use chalk_ir::{
     fold::{Fold, Folder},
     interner::{HasInterner, Interner},

chalk-ir/Cargo.toml

@@ -1,4 +1,4 @@
-use chalk_engine_base::results::*;
+use chalk_base::results::*;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::{HasInterner, Interner};

chalk-ir/src/fold/boring_impls.rs

@@ -1,4 +1,4 @@
-use chalk_engine_base::results::*;
+use chalk_base::results::*;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::HasInterner;

chalk-ir/src/lib.rs

@@ -1,4 +1,4 @@
-use chalk_engine_base::results::*;
+use chalk_base::results::*;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::Interner;

chalk-solve/Cargo.toml

@@ -1,4 +1,4 @@
-use chalk_engine_base::results::*;
+use chalk_base::results::*;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::{HasInterner, Interner};
 use chalk_ir::visit::{Visit, Visitor};

chalk-solve/src/clauses.rs

@@ -1,7 +1,7 @@
 use super::var::*;
 use super::*;
 use crate::infer::instantiate::IntoBindersAndValue;
-use chalk_engine_base::results::*;
+use chalk_base::results::*;
 use chalk_ir::cast::Cast;
 use chalk_ir::fold::{Fold, Folder};
 use chalk_ir::interner::{HasInterner, Interner};

chalk-solve/src/clauses/generalize.rs

@@ -7,7 +7,7 @@ use std::fmt::Debug;
 use std::sync::Arc;
 
 #[macro_use]
-extern crate chalk_engine_base;
+extern crate chalk_base;
 
 #[cfg(test)]
 #[macro_use]

chalk-solve/src/infer/canonicalize.rs

@@ -7,7 +7,7 @@ use self::search_graph::{DepthFirstNumber, SearchGraph};
 use self::stack::{Stack, StackDepth};
 use crate::clauses::program_clauses_for_goal;
 use crate::{Guidance, RustIrDatabase, Solution};
-use chalk_engine_base::results::{Fallible, Floundered, NoSolution};
+use chalk_base::results::{Fallible, Floundered, NoSolution};
 use chalk_ir::interner::Interner;
 use chalk_ir::{
     Binders, Canonical, ClausePriority, ConstrainedSubst, DomainGoal, Environment, GenericArg,

chalk-solve/src/infer/invert.rs

@@ -7,7 +7,7 @@ use crate::infer::{
 };
 use crate::recursive::{Minimums, Solver};
 use crate::solve::{truncate, Guidance, Solution};
-use chalk_engine_base::results::{Fallible, NoSolution};
+use chalk_base::results::{Fallible, NoSolution};
 use chalk_ir::cast::Cast;
 use chalk_ir::fold::Fold;
 use chalk_ir::interner::{HasInterner, Interner};

chalk-solve/src/infer/normalize_deep.rs

@@ -6,7 +6,7 @@ use std::usize;
 use super::stack::StackDepth;
 use super::{Minimums, UCanonicalGoal};
 use crate::Solution;
-use chalk_engine_base::results::{Fallible, NoSolution};
+use chalk_base::results::{Fallible, NoSolution};
 use chalk_ir::{interner::Interner, ClausePriority};
 use rustc_hash::FxHashMap;
 

chalk-solve/src/infer/ucanonicalize.rs

@@ -6,11 +6,11 @@ use crate::infer::InferenceTable;
 use crate::solve::truncate;
 use crate::solve::Solution;
 use crate::RustIrDatabase;
+use chalk_base::results::{Fallible, Floundered};
 use chalk_derive::HasInterner;
 use chalk_engine::context;
 use chalk_engine::hh::HhGoal;
 use chalk_engine::{CompleteAnswer, ExClause, Literal};
-use chalk_engine_base::results::{Fallible, Floundered};
 use chalk_ir::cast::Cast;
 use chalk_ir::cast::Caster;
 use chalk_ir::interner::Interner;

chalk-solve/src/infer/unify.rs

@@ -1,6 +1,6 @@
 use crate::infer::InferenceTable;
 use crate::solve::slg::{self, SlgContext, TruncatingInferenceTable};
-use chalk_engine_base::results::Fallible;
+use chalk_base::results::Fallible;
 use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::Fold;
 use chalk_ir::interner::{HasInterner, Interner};