Skip to content

Commit

Permalink
Cleaned up imports per coding standards.
Browse files Browse the repository at this point in the history
No functional changes; just style.
  • Loading branch information
chromatic committed Feb 7, 2014
1 parent 813886b commit b91b6a7
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions src/libstd/ascii.rs
Expand Up @@ -10,17 +10,17 @@

//! Operations on ASCII strings and characters

use to_str::{ToStr,IntoStr};
use to_str::{ToStr, IntoStr};
use str;
use str::Str;
use str::StrSlice;
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)]
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/cell.rs
Expand Up @@ -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};

Expand Down
4 changes: 2 additions & 2 deletions src/libstd/local_data.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/reference.rs
Expand Up @@ -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))]
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/run.rs
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/libstd/trie.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/unit.rs
Expand Up @@ -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 () {
Expand Down

5 comments on commit b91b6a7

@bors
Copy link
Contributor

@bors bors commented on b91b6a7 Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on b91b6a7 Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging chromatic/rust/gh_11983_deglob_std = b91b6a7 into auto

@bors
Copy link
Contributor

@bors bors commented on b91b6a7 Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chromatic/rust/gh_11983_deglob_std = b91b6a7 merged ok, testing candidate = ca40da8

@bors
Copy link
Contributor

@bors bors commented on b91b6a7 Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on b91b6a7 Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = ca40da8

Please sign in to comment.