Project re-org

Author: udoprog

Cargo.toml

@@ -8,10 +8,16 @@ members = [
     "crates/rune-wasm",
     "crates/runestick",
     "crates/runestick-macros",
+    "tests",
+    "examples",
+    "benches",
 ]
 
 exclude = [
     "tools/builder",
     "tools/site",
     "tools/generate",
 ]
+
+[profile.bench]
+lto = false

benches/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "rune-benches"
+version = "0.0.0"
+authors = ["John-John Tedro <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+tokio = { version = "0.2.22", features = ["macros"] }
+
+runestick = { path = "../crates/runestick" }
+rune-tests = { path = "../tests", default-features = false }

crates/rune/benches/aoc_2020_1a.rs benches/benches/aoc_2020_1a.rs

@@ -11,14 +11,14 @@ use test::Bencher;
 const INPUT: &str = include_str!("data/aoc_2020_1.txt");
 
 #[bench]
-fn aoc_2020_1a(b: &mut Bencher) -> anyhow::Result<()> {
+fn aoc_2020_1a(b: &mut Bencher) -> runestick::Result<()> {
     let mut data = runestick::Vec::new();
 
     for line in INPUT.split('\n').filter(|s| !s.is_empty()) {
         data.push_value(str::parse::<i64>(line)?)?;
     }
 
-    let vm = rune::rune_vm! {
+    let vm = rune_tests::rune_vm! {
         use std::string;
 
         struct NoSolution;

crates/rune/benches/aoc_2020_1b.rs benches/benches/aoc_2020_1b.rs

@@ -11,14 +11,14 @@ use test::Bencher;
 const INPUT: &str = include_str!("data/aoc_2020_1.txt");
 
 #[bench]
-fn aoc_2020_1b(b: &mut Bencher) -> anyhow::Result<()> {
+fn aoc_2020_1b(b: &mut Bencher) -> runestick::Result<()> {
     let mut data = runestick::Vec::new();
 
     for line in INPUT.split('\n').filter(|s| !s.is_empty()) {
         data.push_value(str::parse::<i64>(line)?)?;
     }
 
-    let vm = rune::rune_vm! {
+    let vm = rune_tests::rune_vm! {
         mod iter {
             pub fn all_pairs(data) {
                let count = data.len();

crates/rune/benches/data/aoc_2020_1.txt benches/benches/data/aoc_2020_1.txt

@@ -59,7 +59,7 @@ Below we showcase this, with the help of the `rune_s!` macro from the `testing`
 module.
 
 ```rust,noplaypen
-{{#include ../../crates/rune/examples/call_rune_fn.rs}}
+{{#include ../../examples/call_rune_fn.rs}}
 ```
 
 ```text

book/src/closures.md

@@ -86,7 +86,7 @@ The following uses an implementation of `add_assign` which performs checked
 addition:
 
 ```rust,noplaypen
-{{#include ../../crates/rune/examples/checked_add_assign.rs}}
+{{#include ../../examples/checked_add_assign.rs}}
 ```
 
 ```text

book/src/field_functions.md

@@ -50,7 +50,7 @@ same time it can be harder to reason on what your program will do.
 Rune functions can be easily set up and called from Rust.
 
 ```rust,noplaypen
-{{#include ../../crates/rune/examples/basic_add.rs}}
+{{#include ../../examples/basic_add.rs}}
 ```
 
 ```text

book/src/functions.md

@@ -31,7 +31,7 @@ based on its item. So the hash for the item `Foo::new` will always be the same.
 In Rust, we can calculate this hash using the `Hash::type_hash` method:
 
 ```rune
-{{#include ../../crates/rune/examples/function_hash.rs}}
+{{#include ../../examples/function_hash.rs}}
 ```
 
 ```text
@@ -51,7 +51,7 @@ identified as the first argument of the instance function, and must be a type
 registered in the module using [`Module::ty`].
 
 ```rust,noplaypen
-{{#include ../../crates/rune/examples/custom_instance_fn.rs}}
+{{#include ../../examples/custom_instance_fn.rs}}
 ```
 
 ```text

book/src/instance_functions.md

@@ -45,7 +45,7 @@ always strings, but its value must be specified as the sole type parameter.
 Note that the dynamic [`Value`] can be used if the type is unknown.
 
 ```rust,noplaypen
-{{#include ../../crates/rune/examples/object.rs}}
+{{#include ../../examples/object.rs}}
 ```
 
 ```text

book/src/objects.md

@@ -45,7 +45,7 @@ $> cargo run --bin rune -- scripts/book/tuples/tuple_patterns.rn
 Tuples are represented externally as [primitive tuple types].
 
 ```rust,noplaypen
-{{#include ../../crates/rune/examples/tuple.rs}}
+{{#include ../../examples/tuple.rs}}
 ```
 
 ```text

book/src/tuples.md

@@ -36,7 +36,7 @@ Hello
 Vectors are represented externally as the standard [`Vec`].
 
 ```rust
-{{#include ../../crates/rune/examples/vector.rs}}
+{{#include ../../examples/vector.rs}}
 ```
 
 ```text
@@ -48,7 +48,7 @@ If you have a vector which has values of non-uniform types, you can use
 [`VecTuple`] to deal with them.
 
 ```rust
-{{#include ../../crates/rune/examples/vec_tuple.rs}}
+{{#include ../../examples/vec_tuple.rs}}
 ```
 
 ```text

book/src/vectors.md

@@ -15,17 +15,15 @@ An embeddable dynamic programming language for Rust.
 """
 
 [features]
-default = ["diagnostics", "testing"]
+default = ["diagnostics"]
 diagnostics = ["codespan-reporting"]
-testing = ["futures-executor"]
 
 [dependencies]
 thiserror = "1.0.20"
 log = "0.4.11"
 codespan-reporting = {version = "0.9.5", optional = true}
 hashbrown = "0.8.2"
 num = "0.3.0"
-futures-executor = {version = "0.3.5", optional = true}
 itoa = "0.4.6"
 ryu = "1.0"
 smallvec = "1.4.2"
@@ -35,13 +33,6 @@ rune-macros = {version = "0.7.0", path = "../rune-macros"}
 
 [dev-dependencies]
 tokio = {version = "0.2.22", features = ["macros"]}
-futures-executor = "0.3.5"
-anyhow = "1.0.34"
-
-rune-modules = {version = "0.7.0", path = "../rune-modules", features = ["full"]}
 
 [package.metadata.docs.rs]
 all-features = true
-
-[profile.bench]
-lto = false

crates/rune/Cargo.toml

@@ -106,7 +106,7 @@
 //!
 //! #[tokio::main]
 //! async fn main() -> Result<(), Box<dyn Error>> {
-//!     let context = rune_modules::default_context()?;
+//!     let context = runestick::Context::with_default_modules()?;
 //!     let options = rune::Options::default();
 //!
 //!     let mut sources = rune::Sources::new();
@@ -194,10 +194,7 @@ mod shared;
 mod spanned;
 mod worker;
 
-// NB: this has to be defined before the `tests` module, because it's used in
-// there.
-#[cfg(any(test, feature = "testing"))]
-#[macro_use]
+#[doc(hidden)]
 pub mod testing;
 
 /// Internal collection re-export.

crates/rune/src/lib.rs

@@ -44,8 +44,9 @@ pub struct LoadSourcesError;
 /// use std::error::Error;
 ///
 /// # fn main() -> Result<(), Box<dyn Error>> {
-/// let context = rune_modules::default_context()?;
+/// let context = runestick::Context::with_default_modules()?;
 /// let mut options = rune::Options::default();
+///
 /// let mut sources = rune::Sources::new();
 /// sources.insert(Source::new("entry", r#"
 /// pub fn main() {