From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 27 Nov 2020 23:57:53 +0000 (+0000)
Subject: sort imports
X-Git-Tag: otter-0.2.0~317
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=992abe064b8b19dedab30244a0e2b5053e12962f;p=otter.git

sort imports

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/imports.rs b/src/imports.rs
index ddc86240..c4949a21 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -38,73 +38,53 @@ pub use std::thread::{self,sleep};
 pub use std::time::Duration;
 pub use std::time::Instant;
 
-pub use boolinator::Boolinator as _;
-
-pub use thiserror::Error;
 pub use anyhow::{Context,anyhow};
+pub use arrayvec::ArrayVec;
+pub use boolinator::Boolinator as _;
+pub use delegate::delegate;
+pub use either::{Either,Left,Right};
 pub use fehler::{throws,throw};
-
-pub use serde::{Serialize,Deserialize,de::DeserializeOwned};
-pub use serde::{Serializer,Deserializer};
-pub use serde::ser::SerializeTuple;
-
-pub use serde_with::DeserializeFromStr;
-pub use serde_with::SerializeDisplay;
-
-pub use rocket_contrib::helmet::*;
-pub use rocket_contrib::templates::Template;
-
-pub use percent_encoding::utf8_percent_encode;
-pub use percent_encoding::percent_decode_str;
+pub use flexi_logger::{LogSpecification};
+pub use fs2::FileExt;
+pub use if_chain::if_chain;
+pub use index_vec::{define_index_type,index_vec,IndexVec,IndexSlice};
+pub use itertools::EitherOrBoth;
+pub use itertools::Itertools;
+pub use lazy_static::lazy_static;
+pub use log::{log, log_enabled};
+pub use log::{trace,debug,info,warn,error};
+pub use num_traits::{Bounded, FromPrimitive, ToPrimitive};
+pub use ordered_float::OrderedFloat;
 pub use percent_encoding::NON_ALPHANUMERIC;
-
-pub use rocket::{State,Rocket};
+pub use percent_encoding::percent_decode_str;
+pub use percent_encoding::utf8_percent_encode;
+pub use rand::Rng;
+pub use rand::distributions::Alphanumeric;
+pub use rand::thread_rng;
+pub use regex::Regex;
+pub use rocket::http::Status;
 pub use rocket::http::{RawStr,ContentType};
+pub use rocket::request::Request;
 pub use rocket::request::{FromParam,FromRequest,FromFormValue,LenientForm};
 pub use rocket::response::NamedFile;
-pub use rocket::response;
-
-pub use rocket::request::Request;
 pub use rocket::response::{Response,Responder};
+pub use rocket::response;
+pub use rocket::{State,Rocket};
 pub use rocket::{post,get,routes};
+pub use rocket_contrib::helmet::*;
 pub use rocket_contrib::json::Json;
-pub use rocket::http::Status;
-
-pub use rand::thread_rng;
-pub use rand::Rng;
-pub use rand::distributions::Alphanumeric;
-
+pub use rocket_contrib::templates::Template;
+pub use serde::ser::SerializeTuple;
+pub use serde::{Serialize,Deserialize,de::DeserializeOwned};
+pub use serde::{Serializer,Deserializer};
+pub use serde_with::DeserializeFromStr;
+pub use serde_with::SerializeDisplay;
 pub use slotmap::dense::DenseSlotMap;
-pub type SecondarySlotMap<K,V> = slotmap::secondary::SecondaryMap<K,V>;
-pub use index_vec::{define_index_type,index_vec,IndexVec,IndexSlice};
-
+pub use strum::EnumString;
+pub use thiserror::Error;
 pub use vecdeque_stableix::Deque as StableIndexVecDeque;
 
-pub use fs2::FileExt;
-pub use lazy_static::lazy_static;
-pub use regex::Regex;
-
-pub use arrayvec::ArrayVec;
-
-pub use log::{trace,debug,info,warn,error};
-pub use log::{log, log_enabled};
-
-pub use num_traits::{Bounded, FromPrimitive, ToPrimitive};
-
-pub use flexi_logger::{LogSpecification};
-
-pub use delegate::delegate;
-
-pub use itertools::Itertools;
-pub use itertools::EitherOrBoth;
-
-pub use ordered_float::OrderedFloat;
-
-pub use either::{Either,Left,Right};
-
-pub use if_chain::if_chain;
-
-pub use strum::EnumString;
+pub type SecondarySlotMap<K,V> = slotmap::secondary::SecondaryMap<K,V>;
 
 pub use crate::global::*;
 pub use crate::gamestate::*;