Auto merge of #724 - kbknapp:clippy-run, r=kbknapp

Clippy run
This commit is contained in:
Homu 2016-11-02 08:57:17 +09:00
commit 5cb9c8ad65
3 changed files with 23 additions and 4 deletions

View file

@ -1,4 +1,4 @@
sudo: false
sudo: true
language: rust
rust:
- nightly
@ -10,7 +10,7 @@ matrix:
- rust: nightly
before_script:
- |
pip install 'travis-cargo<0.2' --user &&
pip install git+git://github.com/kbknapp/travis-cargo.git --user &&
export PATH=$HOME/.local/bin:$PATH
script:
- |
@ -24,9 +24,27 @@ addons:
- libcurl4-openssl-dev
- libelf-dev
- libdw-dev
- cmake
- gcc
- binutils-dev
after_success:
- |
travis-cargo --only stable coveralls --no-sudo -- --features "yaml unstable"
wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
tar xzf master.tar.gz &&
cd kcov-master &&
mkdir build &&
cd build &&
cmake .. &&
make &&
sudo make install &&
cd ../.. &&
rm -rf kcov-master &&
cargo clean &&
cargo test --no-run --features "yaml unstable" &&
for file in target/debug/*-*; do mkdir -p "target/cov/$(basename $file)"; kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
for file in target/debug/deps/clap-*; do mkdir -p "target/cov/$(basename $file)"; kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "deps/$file"; done &&
bash <(curl -s https://codecov.io/bash) &&
echo "Uploaded code coverage"
env:
global:
- TRAVIS_CARGO_NIGHTLY_FEATURE=lints

View file

@ -24,7 +24,7 @@ ansi_term = { version = "~0.9.0", optional = true }
term_size = { version = "~0.2.0", optional = true }
libc = { version = "~0.2.9", optional = true }
yaml-rust = { version = "~0.3.2", optional = true }
clippy = { version = "~0.0.95", optional = true }
clippy = { version = "~0.0.96", optional = true }
[dev-dependencies]
regex = "~0.1.69"

View file

@ -260,6 +260,7 @@ impl<'a, 'b> Parser<'a, 'b>
}
}
#[cfg_attr(feature = "lints", allow(needless_borrow))]
pub fn derive_display_order(&mut self) {
if self.settings.is_set(AppSettings::DeriveDisplayOrder) {
let unified = self.settings.is_set(AppSettings::UnifiedHelpMessage);