Fold runtime/ crate into this source tree

While I like the idea of having a runtime completely decoupled from the
syntax and compiler, I don't think this is that big of a project for
that to be necessary or even useful yet.

Signed-off-by: Alek Ratzloff <alekratz@gmail.com>

Cargo.toml

@@ -17,10 +17,13 @@ lrpar = "0.9"
 lrlex = "0.9"
 structopt = "0.3"
 snafu = "0.6.6"
+maplit = "1.0.2"
+once_cell = "1.4.1"
 
 #lazy_static = "1.4.0"
 #regex = "1.3.7"
 #derivative = "2.1.1"
 
-[dependencies.runtime]
+[dependencies.shredder]
-path = "runtime"
+git = "https://github.com/Others/shredder"
+features = ["nightly-features"]

runtime/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "runtime"
-version = "0.1.0"
-authors = ["Alek Ratzloff <alekratz@gmail.com>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-maplit = "1.0.2"
-once_cell = "1.4.1"
-
-[dependencies.shredder]
-git = "https://github.com/Others/shredder"
-features = ["nightly-features"]

runtime/src/lib.rs

@@ -1,4 +0,0 @@
-#![feature(unsize, coerce_unsized)]
-
-#[macro_use] pub mod obj;
-#[macro_use] pub mod vm;

src/compile/mod.rs

@@ -1,7 +1,7 @@
 pub mod thunk;
 pub mod error;
 
-use runtime::{obj::prelude::*, vm::consts::*};
+use crate::{obj::prelude::*, vm::consts::*};
 use std::collections::HashMap;
 
 pub struct Compile<'t> {

src/compile/thunk.rs

@@ -1,8 +1,9 @@
 use crate::{
     compile::{error::*, Compile},
     syn::{ast::*, visit::*},
+    obj::prelude::*,
+    vm::inst::*
 };
-use runtime::{obj::prelude::*, vm::inst::*};
 use std::mem;
 
 pub enum Thunk {

src/lib.rs

@@ -1,4 +1,6 @@
+#![feature(unsize, coerce_unsized)]
+
 pub mod syn;
 pub mod compile;
-
+pub mod obj;
-pub use runtime;
+pub mod vm;