about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-28 12:42:45 +0000
committerbors <bors@rust-lang.org>2015-03-28 12:42:45 +0000
commit3e7385aae9d58c8e12137d7c07aad48551048c13 (patch)
tree8da050722f9345ea690c8d0a05897013b6bef00d /src/liballoc
parentf8b6e28e758231f611e8e7923aa607cebd150717 (diff)
parent95f4061c499fc2c908b4d38766813d8f649ec139 (diff)
downloadrust-3e7385aae9d58c8e12137d7c07aad48551048c13.tar.gz
rust-3e7385aae9d58c8e12137d7c07aad48551048c13.zip
Auto merge of #23806 - Manishearth:rollup, r=Manishearth
- Successful merges: #23332, #23751, #23788, #23803, #23804
- Failed merges: 
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/arc.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index 338d7e33631..9b37ddc7ab5 100644
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -76,7 +76,7 @@ use core::prelude::*;
 use core::atomic;
 use core::atomic::Ordering::{Relaxed, Release, Acquire, SeqCst};
 use core::fmt;
-use core::cmp::{Ordering};
+use core::cmp::Ordering;
 use core::default::Default;
 use core::mem::{min_align_of, size_of};
 use core::mem;