Skip to content
This repository was archived by the owner on Dec 29, 2021. It is now read-only.

Commit 177493e

Browse files
committed
Merge #47
47: Bump clippy version and rust nightly to 2017-10-09 r=epage a=killercup
2 parents 81c0958 + 67d353e commit 177493e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ rust:
77
- nightly
88
matrix:
99
include:
10-
- rust: nightly-2017-03-15
10+
- rust: nightly-2017-10-09
1111
env: CLIPPY=YESPLEASE
1212
script: |
13-
cargo +nightly-2017-03-15 install clippy --vers "0.0.120"
14-
cargo +nightly-2017-03-15 clippy
13+
cargo +nightly-2017-10-09 install clippy --vers "0.0.165"
14+
cargo +nightly-2017-10-09 clippy -- -D warnings
1515
before_script:
1616
- |
1717
pip install 'travis-cargo<0.2' --user &&

src/assert.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,8 @@ impl OutputAssertionBuilder {
341341
/// .stdout().not().contains("73")
342342
/// .unwrap();
343343
/// ```
344+
// No clippy, we don't want to implement std::ops::Not :)
345+
#[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))]
344346
pub fn not(mut self) -> Self {
345347
self.expected_result = ! self.expected_result;
346348
self

src/output.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub enum OutputKind {
6565
}
6666

6767
impl OutputKind {
68-
pub fn select<'a>(self, o: &'a Output) -> &'a [u8] {
68+
pub fn select(self, o: &Output) -> &[u8] {
6969
match self {
7070
OutputKind::StdOut => &o.stdout,
7171
OutputKind::StdErr => &o.stderr,

0 commit comments

Comments
 (0)