Skip to content

Switch to using std::sync instead of libsync #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion macros/src/atom/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use syntax::ext::base::{ExtCtxt, MacResult, MacExpr};
use syntax::parse::token::{get_ident, InternedString, Ident, Literal, Lit};

use std::iter::Chain;
use std::slice::{Items, Found, NotFound};
use std::collections::HashMap;
use std::ascii::AsciiExt;

Expand Down
2 changes: 1 addition & 1 deletion src/atom/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use alloc::heap;
use alloc::boxed::Box;
use collections::string::String;
use collections::hash::{Hash, Hasher};
use sync::Mutex;
use std::sync::Mutex;

use self::repr::{UnpackedAtom, Static, Inline, Dynamic};

Expand Down
13 changes: 0 additions & 13 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ extern crate core;

extern crate alloc;
extern crate collections;
extern crate sync;

#[cfg(test)]
extern crate test;

#[cfg(test)]
extern crate std;

#[phase(plugin)]
Expand Down Expand Up @@ -59,14 +57,3 @@ mod string_cache {
pub use atom;
pub use namespace;
}

// For macros and deriving.
#[cfg(not(test))]
mod std {
pub use core::{cmp, fmt, clone, option, mem, result};
pub use collections::hash;

pub mod sync {
pub use sync::one::{Once, ONCE_INIT};
}
}