From be32ad795a439258f16802f2157b81fb63cf19aa Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Mon, 9 Oct 2017 21:28:47 +0200 Subject: [PATCH 1/2] Bump clippy version and rust nightly to 2017-10-09 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7609a69..6af8429 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,11 @@ rust: - nightly matrix: include: - - rust: nightly-2017-03-15 + - rust: nightly-2017-10-09 env: CLIPPY=YESPLEASE script: | - cargo +nightly-2017-03-15 install clippy --vers "0.0.120" - cargo +nightly-2017-03-15 clippy + cargo +nightly-2017-10-09 install clippy --vers "0.0.165" + cargo +nightly-2017-10-09 clippy -- -D warnings before_script: - | pip install 'travis-cargo<0.2' --user && From 67d353ec4c974699243a34cece8092505f9fa828 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Mon, 9 Oct 2017 21:41:02 +0200 Subject: [PATCH 2/2] Fix clippy lints --- src/assert.rs | 2 ++ src/output.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/assert.rs b/src/assert.rs index cb4125c..08566ca 100644 --- a/src/assert.rs +++ b/src/assert.rs @@ -341,6 +341,8 @@ impl OutputAssertionBuilder { /// .stdout().not().contains("73") /// .unwrap(); /// ``` + // No clippy, we don't want to implement std::ops::Not :) + #[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))] pub fn not(mut self) -> Self { self.expected_result = ! self.expected_result; self diff --git a/src/output.rs b/src/output.rs index 920ade6..e2d7ba3 100644 --- a/src/output.rs +++ b/src/output.rs @@ -65,7 +65,7 @@ pub enum OutputKind { } impl OutputKind { - pub fn select<'a>(self, o: &'a Output) -> &'a [u8] { + pub fn select(self, o: &Output) -> &[u8] { match self { OutputKind::StdOut => &o.stdout, OutputKind::StdErr => &o.stderr,