test fixes (#600)

* test fixes

* filter mac osx until stable pulls right crate

Author: AndyGauge

.travis.yml

@@ -24,6 +24,8 @@ matrix:
     - rust: stable
       os: linux
       env: CONTENT_TESTS=1 CONTENT_TESTS_LINKS=1
+    - rust: stable 
+      os: osx
 
 addons:
   apt:

Cargo.toml

@@ -23,7 +23,7 @@ data-encoding = "2.1.0"
 env_logger = "0.5"
 error-chain = "0.12"
 flate2 = "1.0"
-glob = "0.2"
+glob = "0.3"
 image = "0.20"
 lazy_static = "1.0"
 log = "0.4"
@@ -63,9 +63,9 @@ walkdir = "2.0"
 syslog = "5.0"
 
 [build-dependencies]
-skeptic = "0.13"
+skeptic = { git = 'https://github.com/andygauge/rust-skeptic'}
 walkdir = "2.0"
 
 [dev-dependencies]
-skeptic = "0.13"
+skeptic = { git = 'https://github.com/andygauge/rust-skeptic'}
 walkdir = "2.0"

src/algorithms/randomness/rand-custom.md

@@ -5,7 +5,7 @@
 Randomly generates a tuple `(i32, bool, f64)` and variable of user defined type `Point`.
 Implements the [`Distribution`] trait on type Point for [`Standard`] in order to allow random generation.
 
-```rust,edition2018,ignore
+```rust,edition2018
 use rand::Rng;
 use rand::distributions::{Distribution, Standard};
 

src/algorithms/randomness/rand-dist.md

@@ -14,9 +14,10 @@ An example using the [`Normal`] distribution is shown below.
 
 ```rust,edition2018,ignore
 use rand_distr::{Distribution, Normal, NormalError};
+use rand::thread_rng;
 
 fn main() -> Result<(), NormalError> {
-    let mut rng = rand::thread_rng();
+    let mut rng = thread_rng();
     let normal = Normal::new(2.0, 3.0)?;
     let v = normal.sample(&mut rng);
     println!("{} is from a N(2, 9) distribution", v);

src/algorithms/randomness/rand-passwd.md

@@ -5,7 +5,7 @@
 Randomly generates a string of given length ASCII characters in the range `A-Z,
 a-z, 0-9`, with [`Alphanumeric`] sample.
 
-```rust,edition2018,ignore
+```rust,edition2018
 use rand::{thread_rng, Rng};
 use rand::distributions::Alphanumeric;
 

src/algorithms/randomness/rand-range.md

@@ -4,7 +4,7 @@
 
 Generates a random value within half-open `[0, 10)` range (not including `10`) with [`Rng::gen_range`].
 
-```rust,edition2018,ignore
+```rust,edition2018
 use rand::Rng;
 
 fn main() {
@@ -18,7 +18,7 @@ fn main() {
 This has the same effect, but may be faster when repeatedly generating numbers
 in the same range.
 
-```rust,edition2018,ignore
+```rust,edition2018
 
 use rand::distributions::{Distribution, Uniform};
 

src/concurrency/parallel/rayon-parallel-sort.md

@@ -9,7 +9,7 @@ values in parallel.  Although [multiple options]
 exist to sort an enumerable data type, [`par_sort_unstable`]
 is usually faster than [stable sorting] algorithms.
 
-```rust,edition2018,ignore
+```rust,edition2018
 
 use rand::{Rng, thread_rng};
 use rand::distributions::Alphanumeric;

src/concurrency/parallel/rayon-thumbnails.md

@@ -29,7 +29,7 @@ use rayon::prelude::*;
 
 fn main() -> Result<()> {
     let options: MatchOptions = Default::default();
-    let files: Vec<_> = glob_with("*.jpg", &options)?
+    let files: Vec<_> = glob_with("*.jpg", options)?
         .filter_map(|x| x.ok())
         .collect();
 

src/cryptography/encryption/pbkdf2.md

@@ -9,7 +9,7 @@ function [`pbkdf2::derive`].  Verifies the hash is correct with
 [`SecureRandom::fill`], which fills the salt byte array with
 securely generated random numbers.
 
-```rust,edition2018,ignore
+```rust,edition2018
 
 use data_encoding::HEXUPPER;
 use ring::error::Unspecified;

src/development_tools/build_tools/cc-bundled-static.md

@@ -56,24 +56,24 @@ void greet(const char* name) {
 ### `src/main.rs`
 
 ```rust,edition2018,ignore
+use error_chain::error_chain;
 use std::ffi::CString;
 use std::os::raw::c_char;
-#
-# error_chain! {
-#     foreign_links {
-#         NulError(::std::ffi::NulError);
-#         Io(::std::io::Error);
-#     }
-# }
-#
-# fn prompt(s: &str) -> Result<String> {
-#     use std::io::Write;
-#     print!("{}", s);
-#     std::io::stdout().flush()?;
-#     let mut input = String::new();
-#     std::io::stdin().read_line(&mut input)?;
-#     Ok(input.trim().to_string())
-# }
+
+error_chain! {
+    foreign_links {
+        NulError(::std::ffi::NulError);
+        Io(::std::io::Error);
+    }
+}
+fn prompt(s: &str) -> Result<String> {
+    use std::io::Write;
+    print!("{}", s);
+    std::io::stdout().flush()?;
+    let mut input = String::new();
+    std::io::stdin().read_line(&mut input)?;
+    Ok(input.trim().to_string())
+}
 
 extern {
     fn hello();