Apply formatting changes from newer cargo fmt

This commit is contained in:
Dirkjan Ochtman
2018-06-07 14:54:33 +02:00
parent 2a13a2ae36
commit 6287c0bfb1
5 changed files with 10 additions and 7 deletions
+1 -1
View File
@@ -419,8 +419,8 @@ const IPV6_MIN_MTU: usize = 1232;
#[cfg(test)]
pub mod tests {
use super::{ClientTransportParameters, ConnectionId, ServerTransportParameters};
use super::{tls, ConnectionState, PartialDecode, Secret};
use super::{ClientTransportParameters, ConnectionId, ServerTransportParameters};
use std::sync::Arc;
#[test]
+3 -2
View File
@@ -3,7 +3,8 @@ use bytes::{Buf, BufMut};
use std::fmt;
use std::io::Cursor;
use ring::{digest, hkdf, aead::{self, OpeningKey, SealingKey}};
use ring::aead::{self, OpeningKey, SealingKey};
use ring::{digest, hkdf};
pub use ring::aead::AES_128_GCM;
pub use ring::digest::SHA256;
@@ -175,7 +176,7 @@ mod tests {
let hs_cid = ConnectionId {
len: 8,
bytes: [
0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
],
};
let client_handshake_secret = super::expanded_handshake_secret(hs_cid, b"client hs");
+1 -1
View File
@@ -1,7 +1,7 @@
use futures::future::Future;
use QuicError;
use streams::Streams;
use QuicError;
pub fn start(streams: Streams) -> impl Future<Item = Streams, Error = QuicError> {
println!("REQUEST STREAM 2");
+3 -2
View File
@@ -1,4 +1,5 @@
use futures::{Async, AsyncSink, Future, Poll, Sink, Stream, sync::mpsc::{self, Receiver, Sender}};
use futures::sync::mpsc::{self, Receiver, Sender};
use futures::{Async, AsyncSink, Future, Poll, Sink, Stream};
use super::{QuicError, QuicResult};
use conn_state::ConnectionState;
@@ -8,7 +9,7 @@ use parameters::ServerTransportParameters;
use tls;
use types::ConnectionId;
use std::collections::{HashMap, hash_map::Entry};
use std::collections::{hash_map::Entry, HashMap};
use std::net::{SocketAddr, ToSocketAddrs};
use std::sync::Arc;
+2 -1
View File
@@ -136,7 +136,8 @@ pub(crate) mod tests {
extern crate untrusted;
use self::untrusted::Input;
use rustls::internal::pemfile;
use std::{fs::File, io::{BufReader, Read}};
use std::fs::File;
use std::io::{BufReader, Read};
use webpki;
pub fn client_config() -> super::ClientConfig {