Merge pull request #175 from nikomatsakis/partition-into-crates

extract `ir` and `solve` into their own crates

Author: nikomatsakis

Cargo.lock

@@ -11,7 +11,6 @@ keywords = ["compiler", "traits", "prolog"]
 [dependencies]
 diff = "0.1.11"
 docopt = "1.0.0"
-ena = "0.4"
 error-chain = "0.12.0"
 itertools = "0.7.8"
 lalrpop-intern = "0.14"
@@ -25,6 +24,14 @@ stacker = "0.1.2"
 version = "0.1.0"
 path = "chalk-parse"
 
+[dependencies.chalk-ir]
+version = "0.1.0"
+path = "chalk-ir"
+
+[dependencies.chalk-solve]
+version = "0.1.0"
+path = "chalk-solve"
+
 [dependencies.chalk-macros]
 version = "0.1.0"
 path = "chalk-macros"

Cargo.toml

@@ -50,7 +50,6 @@
 //!   Popularized by Lambda Prolog.
 
 #![feature(in_band_lifetimes)]
-#![feature(macro_vis_matcher)]
 #![feature(step_trait)]
 #![feature(non_modrs_mods)]
 

chalk-engine/src/lib.rs

@@ -0,0 +1,20 @@
+[package]
+name = "chalk-ir"
+version = "0.1.0"
+description = "Chalk's internal representation of types, goals, and clauses"
+license = "Apache-2.0/MIT"
+authors = ["Rust Compiler Team", "Chalk developers"]
+repository = "https://github.com/rust-lang-nursery/chalk"
+readme = "README.md"
+keywords = ["compiler", "traits", "prolog"]
+
+[dependencies]
+lalrpop-intern = "0.14"
+
+[dependencies.chalk-macros]
+version = "0.1.0"
+path = "../chalk-macros"
+
+[dependencies.chalk-engine]
+version = "0.7.2"
+path = "../chalk-engine"

chalk-ir/Cargo.toml

@@ -1,4 +1,4 @@
-use ir::*;
+use ::*;
 use std::marker::PhantomData;
 
 /// The `Cast` trait is used to make annoying upcasts between
@@ -26,7 +26,7 @@ use std::marker::PhantomData;
 /// as part of this, they should always use the same set of free
 /// variables (the `Canonical` implementation, for example, relies on
 /// that).
-crate trait Cast<T>: Sized {
+pub trait Cast<T>: Sized {
     fn cast(self) -> T;
 }
 
@@ -224,7 +224,7 @@ where
     }
 }
 
-crate struct Casted<I, U> {
+pub struct Casted<I, U> {
     iterator: I,
     _cast: PhantomData<U>,
 }
@@ -246,7 +246,7 @@ where
 
 /// An iterator adapter that casts each element we are iterating over
 /// to some other type.
-crate trait Caster<U>: Sized {
+pub trait Caster<U>: Sized {
     fn casted(self) -> Casted<Self, U>;
 }
 

src/cast.rs renamed to chalk-ir/src/cast.rs

@@ -1,8 +1,8 @@
-use ir::*;
+use ::*;
 use zip::{Zip, Zipper};
 
 /// A fast check to see whether two things could ever possibly match.
-crate trait CouldMatch<T> {
+pub trait CouldMatch<T> {
     fn could_match(&self, other: &T) -> bool;
 }
 

src/ir/could_match.rs renamed to chalk-ir/src/could_match.rs

@@ -5,16 +5,9 @@ use super::*;
 impl Debug for ItemId {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
         tls::with_current_program(|p| match p {
-            Some(prog) => if let Some(k) = prog.type_kinds.get(self) {
-                write!(fmt, "{}", k.name)
-            } else if let Some(k) = prog.associated_ty_data.get(self) {
-                write!(fmt, "({:?}::{})", k.trait_id, k.name)
-            } else {
-                fmt.debug_struct("ItemId")
-                    .field("index", &self.index)
-                    .finish()
-            },
-            None => fmt.debug_struct("ItemId")
+            Some(prog) => prog.debug_item_id(*self, fmt),
+            None => fmt
+                .debug_struct("ItemId")
                 .field("index", &self.index)
                 .finish(),
         })
@@ -58,10 +51,7 @@ impl Debug for Ty {
 impl Debug for QuantifiedTy {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
         // FIXME -- we should introduce some names or something here
-        let QuantifiedTy {
-            num_binders,
-            ty,
-        } = self;
+        let QuantifiedTy { num_binders, ty } = self;
         write!(fmt, "for<{}> {:?}", num_binders, ty)
     }
 }
@@ -96,19 +86,7 @@ impl Debug for TraitRef {
 impl Debug for ProjectionTy {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
         tls::with_current_program(|p| match p {
-            Some(program) => {
-                let (associated_ty_data, trait_params, other_params) =
-                    program.split_projection(self);
-                write!(
-                    fmt,
-                    "<{:?} as {:?}{:?}>::{}{:?}",
-                    &trait_params[0],
-                    associated_ty_data.trait_id,
-                    Angle(&trait_params[1..]),
-                    associated_ty_data.name,
-                    Angle(&other_params)
-                )
-            }
+            Some(program) => program.debug_projection(self, fmt),
             None => write!(
                 fmt,
                 "({:?}){:?}",
@@ -132,7 +110,7 @@ impl Debug for UnselectedProjectionTy {
     }
 }
 
-crate struct Angle<'a, T: 'a>(pub &'a [T]);
+pub struct Angle<'a, T: 'a>(pub &'a [T]);
 
 impl<'a, T: Debug> Debug for Angle<'a, T> {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
@@ -165,7 +143,11 @@ impl Debug for ProjectionEq {
 
 impl Debug for UnselectedNormalize {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
-        write!(fmt, "UnselectedNormalize({:?} -> {:?})", self.projection, self.ty)
+        write!(
+            fmt,
+            "UnselectedNormalize({:?} -> {:?})",
+            self.projection, self.ty
+        )
     }
 }
 
@@ -379,8 +361,7 @@ impl Display for ConstrainedSubst {
         write!(
             f,
             "substitution {}, lifetime constraints {:?}",
-            subst,
-            constraints,
+            subst, constraints,
         )
     }
 }