From 582cba183f18eea5c40b6c035d63ad449a9e8604 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 30 Dec 2014 16:29:27 -0800
Subject: Test fixes and rebase conflicts

---
 src/liballoc/arc.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/liballoc')

diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index 03634657a71..820a3838978 100644
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -600,6 +600,7 @@ mod tests {
     use std::option::Option::{Some, None};
     use std::str::Str;
     use std::sync::atomic;
+    use std::sync::atomic::Ordering::{Acquire, SeqCst};
     use std::task;
     use std::kinds::Send;
     use std::vec::Vec;
-- 
cgit 1.4.1-3-g733a5