Skip to content

Commit 0cc7b05

Browse files
committed
Remove chalk-base
1 parent 52a3530 commit 0cc7b05

40 files changed

+115
-162
lines changed

Cargo.lock

Lines changed: 1 addition & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ salsa = "0.10.0"
2121
serde = "1.0"
2222
serde_derive = "1.0"
2323

24-
chalk-base = { version = "0.10.1-dev", path = "chalk-base" }
2524
chalk-derive = { version = "0.10.1-dev", path = "chalk-derive" }
2625
chalk-engine = { version = "0.10.1-dev", path = "chalk-engine" }
2726
chalk-ir = { version = "0.10.1-dev", path = "chalk-ir" }

book/src/publishing.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
**Note: this is mostly only useful for maintainers**
44

55
The following crates get published to crates.io:
6-
- `chalk-base`
76
- `chalk-derive`
87
- `chalk-engine`
98
- `chalk-ir`

book/src/what_is_chalk/crates.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ The following crate is an implementation detail, used internally by `chalk-solve
2121
engine is quite general and not really specific to Rust.
2222
* The `chalk-derive` crate defines custom derives for the `chalk_ir::fold::Fold` trait and other
2323
such things.
24-
* The `chalk-base` crate defines some base solver types and a few miscellaneous
25-
utility macros.
2624

2725
## Crates for standalone REPL and testing
2826

chalk-base/Cargo.toml

Lines changed: 0 additions & 13 deletions
This file was deleted.

chalk-base/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

chalk-base/src/lib.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

chalk-base/src/macros/index.rs

Lines changed: 0 additions & 45 deletions
This file was deleted.

chalk-base/src/results.rs

Lines changed: 0 additions & 13 deletions
This file was deleted.

chalk-derive/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ fn derive_zip(mut s: synstructure::Structure) -> TokenStream {
235235
});
236236

237237
// when the two variants are different
238-
quote!((_, _) => Err(::chalk_base::results::NoSolution)).to_tokens(&mut body);
238+
quote!((_, _) => Err(::chalk_ir::NoSolution)).to_tokens(&mut body);
239239

240240
s.add_bounds(synstructure::AddBounds::None);
241241
s.bound_impl(
@@ -246,7 +246,7 @@ fn derive_zip(mut s: synstructure::Structure) -> TokenStream {
246246
zipper: &mut Z,
247247
a: &Self,
248248
b: &Self,
249-
) -> ::chalk_base::results::Fallible<()>
249+
) -> ::chalk_ir::Fallible<()>
250250
where
251251
#interner: 'i,
252252
{
@@ -316,7 +316,7 @@ fn derive_fold(mut s: synstructure::Structure) -> TokenStream {
316316
&self,
317317
folder: &mut dyn ::chalk_ir::fold::Folder < 'i, #interner, #target_interner >,
318318
outer_binder: ::chalk_ir::DebruijnIndex,
319-
) -> ::chalk_base::results::Fallible<Self::Result>
319+
) -> ::chalk_ir::Fallible<Self::Result>
320320
where
321321
#interner: 'i,
322322
#target_interner: 'i,

0 commit comments

Comments
 (0)