From 2c5e4f8801e8df63bbef46f51febb16a3f6a8f8c Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Thu, 4 Oct 2018 14:18:00 +0200 Subject: [PATCH 1/2] Pinning clippy on 1.29.1 stable to avoid more uneccesary CI breakage --- .travis.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae6e449..8cb2bc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,17 +10,12 @@ matrix: # additional tests - rust: nightly script: | cargo test --all --features nightly - - rust: nightly-2018-04-15 - env: CLIPPY_VERS="0.0.194" - before_script: | - [[ "$(cargo +nightly-2018-04-15 clippy --version)" != "$CLIPPY_VERS" ]] && \ - cargo +nightly-2018-04-15 install clippy --vers "$CLIPPY_VERS" --force || true - script: | - cargo +nightly-2018-04-15 clippy --all -- -D warnings - - rust: 1.25.0 # `stable`: Locking down for consistent behavior - env: RUSTFMT=yes_please - install: - - rustup component add rustfmt-preview - script: - - cargo fmt --all -- --write-mode=diff + - rust: 1.29.1 + env: CLIPPY=YESPLEASE + before_script: rustup component add clippy-preview + script: cargo clippy --all -- -D warnings + - rust: 1.29.1 + env: RUSTFMT=YESPLEASE + before_script: rustup component add rustfmt-preview + script: cargo fmt --all -- --check cache: cargo From 906022c81d75bd94eeea50e3ea313e716a184161 Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Thu, 4 Oct 2018 14:35:38 +0200 Subject: [PATCH 2/2] Running rustfmt to make rustfmt happy :) --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ff148ec..bc70e69 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -94,8 +94,8 @@ pub struct Metadata { #[macro_export] macro_rules! setup_panic { ($meta:expr) => { - use $crate::{handle_dump, print_msg, Metadata}; use std::panic::{self, PanicInfo}; + use $crate::{handle_dump, print_msg, Metadata}; panic::set_hook(Box::new(move |info: &PanicInfo| { let file_path = handle_dump(&$meta, info); @@ -106,8 +106,8 @@ macro_rules! setup_panic { }; () => { - use $crate::{handle_dump, print_msg, Metadata}; use std::panic::{self, PanicInfo}; + use $crate::{handle_dump, print_msg, Metadata}; let meta = Metadata { version: env!("CARGO_PKG_VERSION").into(),