Merge pull request #132 from epage/fix

fix(CI): Get it passing again

.travis.yml

@@ -9,7 +9,6 @@ install:
   - which cargo-coveralls || cargo install cargo-travis
   - which cargo-when || cargo install cargo-when
   - travis_wait cargo when --channel stable install rustfmt --force --vers 0.8.3
-  - travis_wait cargo when --channel nightly install clippy --force || true
   - export PATH=$HOME/.cargo/bin:$PATH
 
 script:
@@ -18,9 +17,8 @@ script:
   - cargo check --verbose
   - cargo check --verbose --features "cli"
   - cargo check --verbose --features "cli serde_yaml serde_json"
+  - cargo clean
   - cargo test  --verbose --features "cli serde_yaml serde_json"
-  - ! which cargo-clippy || cargo when --channel nightly clippy -- --version
-  - ! which cargo-clippy || cargo when --channel nightly clippy --features "cli serde_yaml serde_json"
   - cargo when --channel nightly bench --features "cli serde_yaml serde_json"
   - cargo when --channel stable doc --no-deps --all-features
   - cargo when --channel stable fmt -- --version

Cargo.toml

@@ -33,22 +33,22 @@ dev = []
 [dependencies]
 regex = "0.2"
 lazy_static = "0.2"
-chrono = "0.3"
-unicode-segmentation = "1.1"
+chrono = "0.4"
+unicode-segmentation = "1.2"
 itertools = "0.6.0"
-url = "1.4"
+url = "1.5"
 
 serde = { version = "1.0", optional = true, features = ["derive"] }
-clap = { version = "2.22.0", optional = true }
-error-chain = { version = "0.10.0", optional = true }
+clap = { version = "2.26", optional = true }
+error-chain = { version = "0.11.0", optional = true }
 serde_yaml = { version = "0.7", optional = true }
 serde_json = { version = "1.0", optional = true }
 
 [build-dependencies]
-skeptic = "0.9"
+skeptic = "0.13"
 serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
 difference = "1.0"
-skeptic = "0.9"
+skeptic = "0.13"
 serde_yaml = "0.7"

appveyor.yml

@@ -4,8 +4,6 @@ environment:
 
   matrix:
     # Stable channel
-    - TARGET: x86_64-pc-windows-gnu
-      CHANNEL: stable
     - TARGET: i686-pc-windows-msvc
       CHANNEL: stable
     - TARGET: x86_64-pc-windows-msvc
@@ -30,6 +28,7 @@ test_script:
   - cargo check --verbose
   - cargo check --verbose --features "cli"
   - cargo check --verbose --features "cli serde serde_yaml serde_json"
+  - cargo clean
   - cargo test  --verbose --features "cli serde serde_yaml serde_json"
 
 cache:

benches/liquid.rs

@@ -1,7 +1,6 @@
 #![feature(test)]
 
 extern crate test;
-extern crate serde;
 extern crate serde_yaml;
 
 extern crate liquid;

src/context.rs

@@ -283,7 +283,7 @@ mod test {
         ctx.set_val("test", Value::Num(42f32));
         assert_eq!(ctx.get_val("test").unwrap(), &Value::Num(42f32));
 
-        ctx.run_in_scope(|mut new_scope| {
+        ctx.run_in_scope(|new_scope| {
             // assert that values are chained to the parent scope
             assert_eq!(new_scope.get_val("test").unwrap(), &Value::Num(42f32));
 

src/filters.rs

@@ -431,7 +431,7 @@ pub fn strip_html(input: &Value, args: &[Value]) -> FilterResult {
     let result = MATCHERS
         .iter()
         .fold(input,
-              |acc, &ref matcher| matcher.replace_all(&acc, "").into_owned());
+              |acc, matcher| matcher.replace_all(&acc, "").into_owned());
     Ok(Str(result))
 }