Skip to content

Commit

Permalink
disable rust-fmt in travis to see if our issue is rust-lang/rust#65424
Browse files Browse the repository at this point in the history
  • Loading branch information
kornstar11 committed Dec 10, 2019
1 parent 4bcd3fe commit 2f614c5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ matrix:
env: TARGET=i686-unknown-linux-gnu

before_script:
- cargo +nightly install --force rustfmt-nightly
- cargo +nightly install
#- cargo +nightly install --force rustfmt-nightly

script:
- export PATH="/usr/include:$PATH"
- cargo +nightly fmt --all -- --check
#- cargo +nightly fmt --all -- --check
- cargo test
- cargo doc --no-deps

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mod stats;
mod stream;

pub use crate::{
config::Config, errors::Error, handle::Handle, info::Info, packet::Packet, stats::Stats,
config::Config, errors::Error, handle::Handle, info::Info, packet::Packet, stats::Stats, stats::EMPTY_STATS,
stream::PacketStream,
bridge_stream::BridgeStream
};
Expand Down
2 changes: 1 addition & 1 deletion src/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pub struct Stats {
pub dropped_by_interface: u32,
}

//pub const EMPTY_STATS: Stats = Stats{ received: 0, dropped_by_kernel: 0, dropped_by_interface: 0 };
pub const EMPTY_STATS: Stats = Default::default();

impl Stats {
pub fn combine(&self, other: &Stats) -> Stats {
Expand Down

0 comments on commit 2f614c5

Please sign in to comment.