From ab70e6ec4008379dc86a6ba7af833b96a917b19b Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Wed, 25 Apr 2018 19:29:50 +0200 Subject: [PATCH] run rustfmt --all --- audio/src/decrypt.rs | 2 +- audio/src/fetch.rs | 2 +- audio/src/lewton_decoder.rs | 2 +- playback/src/mixer/softmixer.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/src/decrypt.rs b/audio/src/decrypt.rs index 85ba725a..3b2967d4 100644 --- a/audio/src/decrypt.rs +++ b/audio/src/decrypt.rs @@ -8,7 +8,7 @@ use std::ops::Add; use core::audio_key::AudioKey; const AUDIO_AESIV: &'static [u8] = &[ - 0x72, 0xe0, 0x67, 0xfb, 0xdd, 0xcb, 0xcf, 0x77, 0xeb, 0xe8, 0xbc, 0x64, 0x3f, 0x63, 0x0d, 0x93 + 0x72, 0xe0, 0x67, 0xfb, 0xdd, 0xcb, 0xcf, 0x77, 0xeb, 0xe8, 0xbc, 0x64, 0x3f, 0x63, 0x0d, 0x93, ]; pub struct AudioDecrypt { diff --git a/audio/src/fetch.rs b/audio/src/fetch.rs index 968e1908..e5e461a4 100644 --- a/audio/src/fetch.rs +++ b/audio/src/fetch.rs @@ -1,7 +1,7 @@ use bit_set::BitSet; use byteorder::{BigEndian, ByteOrder, WriteBytesExt}; -use futures::Stream; use futures::sync::{mpsc, oneshot}; +use futures::Stream; use futures::{Async, Future, Poll}; use std::cmp::min; use std::fs; diff --git a/audio/src/lewton_decoder.rs b/audio/src/lewton_decoder.rs index 97c2f35f..982ed157 100644 --- a/audio/src/lewton_decoder.rs +++ b/audio/src/lewton_decoder.rs @@ -25,10 +25,10 @@ where } pub fn next_packet(&mut self) -> Result, VorbisError> { + use self::lewton::audio::AudioReadError::AudioIsHeader; use self::lewton::OggReadError::NoCapturePatternFound; use self::lewton::VorbisError::BadAudio; use self::lewton::VorbisError::OggError; - use self::lewton::audio::AudioReadError::AudioIsHeader; loop { match self.0.read_dec_packet_itl() { Ok(Some(packet)) => return Ok(Some(VorbisPacket(packet))), diff --git a/playback/src/mixer/softmixer.rs b/playback/src/mixer/softmixer.rs index 02106832..b197f09c 100644 --- a/playback/src/mixer/softmixer.rs +++ b/playback/src/mixer/softmixer.rs @@ -1,5 +1,5 @@ -use std::sync::Arc; use std::sync::atomic::{AtomicUsize, Ordering}; +use std::sync::Arc; use super::AudioFilter; use super::Mixer;