diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-30 16:29:27 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-31 08:33:13 -0800 |
| commit | 582cba183f18eea5c40b6c035d63ad449a9e8604 (patch) | |
| tree | dabbfd1652be6819c02207ad60b8ed83f05496fd /src/liballoc | |
| parent | 67d13883f868e6b27aa00a6c69f7c748d16e1c94 (diff) | |
| download | rust-582cba183f18eea5c40b6c035d63ad449a9e8604.tar.gz rust-582cba183f18eea5c40b6c035d63ad449a9e8604.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 1 |
1 files changed, 1 insertions, 0 deletions
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; |