Merge pull request #479 from jackh726/remove-base

Remove chalk-base

Author: jackh726

Cargo.lock

@@ -21,7 +21,6 @@ salsa = "0.10.0"
 serde = "1.0"
 serde_derive = "1.0"
 
-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

@@ -3,7 +3,6 @@
 **Note: this is mostly only useful for maintainers**
 
 The following crates get published to crates.io:
-- `chalk-base`
 - `chalk-derive`
 - `chalk-engine`
 - `chalk-ir`

book/src/publishing.md

@@ -21,8 +21,6 @@ The following crate is an implementation detail, used internally by `chalk-solve
   engine is quite general and not really specific to Rust.
 * The `chalk-derive` crate defines custom derives for the `chalk_ir::fold::Fold` trait and other
   such things.
-* The `chalk-base` crate defines some base solver types and a few miscellaneous
-  utility macros.
 
 ## Crates for standalone REPL and testing
 

book/src/what_is_chalk/crates.md

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