Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Rust.

Browse source
This commit is contained in:
Jack Moffitt 2014-06-01 00:21:53 -06:00
parent 2ae671b5aa
commit 629c4c6afe
148 changed files with 992 additions and 967 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/macros/macros.rs
View file

@ -47,7 +47,7 @@ macro_rules! lazy_init(
static mut s: *$T = 0 as *$T;
static mut ONCE: ::sync::one::Once = ::sync::one::ONCE_INIT;
ONCE.doit(|| {
s = ::std::cast::transmute::<Box<$T>, *$T>(box () ($e));
s = ::std::mem::transmute::<Box<$T>, *$T>(box () ($e));
});
&*s
}
@ -66,7 +66,7 @@ mod tests {
lazy_init! {
static ref NUMBER: uint = times_two(3);
static ref VEC: [Box<uint>, ..3] = [box 1, box 2, box 3];
static ref OWNED_STRING: ~str = "hello".to_owned();
static ref OWNED_STRING: String = "hello".to_string();
static ref HASHMAP: collections::HashMap<uint, &'static str> = {
let mut m = collections::HashMap::new();
m.insert(0u, "abc");
@ -82,7 +82,7 @@ mod tests {
#[test]
fn test_basic() {
assert_eq!(*OWNED_STRING, "hello".to_owned());
assert_eq!(*OWNED_STRING, "hello".to_string());
assert_eq!(*NUMBER, 6);
assert!(HASHMAP.find(&1).is_some());
assert!(HASHMAP.find(&3).is_none());