Merge commit 'e947c428cb99794367d347f373e16075365e86b7' into feature/…

…rayon
barneydmedia · Sep 19, 2019 · 06b114f · 06b114f
2 parents 7268c23 + e947c42
commit 06b114f
Show file tree

Hide file tree

Showing 91 changed files with 996 additions and 794 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /doc/
 /target/
 /.idea/
+/.criterion/
 *.iml
 Cargo.lock
 *.png

diff --git a/Cargo.toml b/Cargo.toml
@@ -23,8 +23,28 @@ rayon = "1.2.0"
 [features]
 default = ["image"]
 
+[dev-dependencies]
+criterion = "0.1.2"
+
+[[bench]]
+name = "open_simplex"
+harness = false
+
+[[bench]]
+name = "perlin"
+harness = false
+
 [[bench]]
-name = "benches"
+name = "super_simplex"
+harness = false
+
+[[bench]]
+name = "value"
+harness = false
+
+[[bench]]
+name = "worley"
+harness = false
 
 [[example]]
 name = "perlin"

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ A procedural noise generation library for Rust.
 [Documentation](https://docs.rs/noise/)
 
 ```rust
-use noise::noise_fns::Fbm;
+use noise::{Fbm, NoiseFn};
 
 let fbm = Fbm::new();
 

diff --git a/benches/benches.rs b/benches/benches.rs