From b91b6a746b8c9ba0b50a01e5e27f7e3baa87b069 Mon Sep 17 00:00:00 2001 From: chromatic Date: Thu, 6 Feb 2014 16:00:49 -0800 Subject: [PATCH] Cleaned up imports per coding standards. No functional changes; just style. --- src/libstd/ascii.rs | 6 +++--- src/libstd/cell.rs | 4 ++-- src/libstd/local_data.rs | 4 ++-- src/libstd/reference.rs | 2 +- src/libstd/run.rs | 4 ++-- src/libstd/trie.rs | 8 ++++---- src/libstd/unit.rs | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 4a43a00c5f5..7965127007c 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -10,7 +10,7 @@ //! Operations on ASCII strings and characters -use to_str::{ToStr,IntoStr}; +use to_str::{ToStr, IntoStr}; use str; use str::Str; use str::StrSlice; @@ -18,9 +18,9 @@ use str::OwnedStr; use container::Container; use cast; use iter::Iterator; -use vec::{ImmutableVector,MutableVector,Vector}; +use vec::{ImmutableVector, MutableVector, Vector}; use to_bytes::IterBytes; -use option::{Option,Some,None}; +use option::{Option, Some, None}; /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero. #[deriving(Clone, Eq, Ord, TotalOrd, TotalEq)] diff --git a/src/libstd/cell.rs b/src/libstd/cell.rs index 6fab74cbc2f..0a3c87f4058 100644 --- a/src/libstd/cell.rs +++ b/src/libstd/cell.rs @@ -10,10 +10,10 @@ //! Types dealing with dynamic mutability -use clone::{Clone,DeepClone}; +use clone::{Clone, DeepClone}; use cmp::Eq; use ops::Drop; -use option::{None,Option,Some}; +use option::{None, Option, Some}; use cast; use kinds::{marker, Pod}; diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs index 5c3ca07f128..8e6643f0413 100644 --- a/src/libstd/local_data.rs +++ b/src/libstd/local_data.rs @@ -41,8 +41,8 @@ local_data::get(key_vector, |opt| assert_eq!(*opt.unwrap(), ~[4])); // magic. use cast; -use option::{None,Option,Some}; -use vec::{ImmutableVector,MutableVector,OwnedVector}; +use option::{None, Option, Some}; +use vec::{ImmutableVector, MutableVector, OwnedVector}; use iter::{Iterator}; use rt::task::{Task, LocalStorage}; use util::replace; diff --git a/src/libstd/reference.rs b/src/libstd/reference.rs index 7584d07ed64..fdbca2b9f33 100644 --- a/src/libstd/reference.rs +++ b/src/libstd/reference.rs @@ -11,7 +11,7 @@ //! Utilities for references #[cfg(not(test))] -use cmp::{Eq,Ord,Ordering,TotalEq,TotalOrd}; +use cmp::{Eq, Ord, Ordering, TotalEq, TotalOrd}; // Equality for region pointers #[cfg(not(test))] diff --git a/src/libstd/run.rs b/src/libstd/run.rs index 1b880bc43ee..fdd26c6c383 100644 --- a/src/libstd/run.rs +++ b/src/libstd/run.rs @@ -20,9 +20,9 @@ use io::process; use io; use libc::{pid_t, c_int}; use libc; -use option::{None,Option,Some}; +use option::{None, Option, Some}; use task::spawn; -use path::{Path,GenericPath}; +use path::{Path, GenericPath}; use result::Ok; use str::Str; use vec::Vector; diff --git a/src/libstd/trie.rs b/src/libstd/trie.rs index 7530c5e338a..f1c3d7a7a91 100644 --- a/src/libstd/trie.rs +++ b/src/libstd/trie.rs @@ -10,16 +10,16 @@ //! Ordered containers with integer keys, implemented as radix tries (`TrieSet` and `TrieMap` types) -use option::{None,Option,Some}; -use container::{Container,Map,Mutable,MutableMap}; -use iter::{Extendable,FromIterator,Iterator}; +use option::{None, Option, Some}; +use container::{Container, Map, Mutable, MutableMap}; +use iter::{Extendable, FromIterator, Iterator}; use mem; use uint; use util::replace; use unstable::intrinsics::init; use vec; use ptr::RawPtr; -use vec::{ImmutableVector,Items,MutableVector,MutItems,OwnedVector}; +use vec::{ImmutableVector, Items, MutableVector, MutItems, OwnedVector}; // FIXME: #5244: need to manually update the TrieNode constructor static SHIFT: uint = 4; diff --git a/src/libstd/unit.rs b/src/libstd/unit.rs index d62fcca63a4..675d6f35aab 100644 --- a/src/libstd/unit.rs +++ b/src/libstd/unit.rs @@ -12,7 +12,7 @@ #[cfg(not(test))] use default::Default; -use cmp::{Eq,Equal,Ord,Ordering,TotalEq,TotalOrd}; +use cmp::{Eq, Equal, Ord, Ordering, TotalEq, TotalOrd}; #[cfg(not(test))] impl Eq for () {