diff --git a/src/rust-cocoa b/src/rust-cocoa index bf9e050161c..c8cf6f388da 160000 --- a/src/rust-cocoa +++ b/src/rust-cocoa @@ -1 +1 @@ -Subproject commit bf9e050161c55ce06f8e7491e15ceff06079d937 +Subproject commit c8cf6f388da1446b267014154b36af85a752a438 diff --git a/src/rust-core-foundation b/src/rust-core-foundation index 01d8691bdf7..488df0c7cd2 160000 --- a/src/rust-core-foundation +++ b/src/rust-core-foundation @@ -1 +1 @@ -Subproject commit 01d8691bdf721edebb0e563069ffb23ba123bef0 +Subproject commit 488df0c7cd29cc58002eb9ccf3ae864de08c6e50 diff --git a/src/rust-glut b/src/rust-glut index 12106aba879..6e1ef6cf8bd 160000 --- a/src/rust-glut +++ b/src/rust-glut @@ -1 +1 @@ -Subproject commit 12106aba8797163a958ce97dacb2900e931f1cc5 +Subproject commit 6e1ef6cf8bd81b3587a124acd8e601b935f96536 diff --git a/src/rust-http-client b/src/rust-http-client index 0961ae2fc54..fce9c5b323b 160000 --- a/src/rust-http-client +++ b/src/rust-http-client @@ -1 +1 @@ -Subproject commit 0961ae2fc54e71838dd495bd91f5b7aa5afa1993 +Subproject commit fce9c5b323bd47f94682cb344afebadd2e2c3a45 diff --git a/src/rust-layers b/src/rust-layers index dbc46d10beb..474d25966ea 160000 --- a/src/rust-layers +++ b/src/rust-layers @@ -1 +1 @@ -Subproject commit dbc46d10beb7e2c542f90ea13952b0c5514667d7 +Subproject commit 474d25966ead7efe73bfa26cbdc3d09c54b7b941 diff --git a/src/servo-gfx/quartz/font_list.rs b/src/servo-gfx/quartz/font_list.rs index 771a22fc894..ca707e2a753 100644 --- a/src/servo-gfx/quartz/font_list.rs +++ b/src/servo-gfx/quartz/font_list.rs @@ -31,14 +31,15 @@ pub impl QuartzFontListHandle { } fn get_available_families() -> FontFamilyMap { - let family_names = quartz::font_list::core_text::font_collection::get_family_names(); + let family_names: CFArray = + quartz::font_list::core_text::font_collection::get_family_names(); let mut family_map : FontFamilyMap = LinearMap::new(); for family_names.each |strref: &CFStringRef| { - let family_name = CFWrapper::wrap_shared(*strref).to_str(); + /*let family_name = CFWrapper::wrap_shared(strref).to_str(); debug!("Creating new FontFamily for family: %s", family_name); let new_family = @FontFamily::new(family_name); - family_map.insert(move family_name, new_family); + family_map.insert(move family_name, new_family);*/ } return move family_map; } diff --git a/src/servo/dom/cow.rs b/src/servo/dom/cow.rs index 0f75fd9a96b..63c74bf25b5 100644 --- a/src/servo/dom/cow.rs +++ b/src/servo/dom/cow.rs @@ -275,7 +275,7 @@ impl Scope { #[cfg(test)] #[allow(non_implicitly_copyable_typarams)] mod test { - use pipes::stream; + use pipes::{SharedChan, stream}; use super::Scope; type animal = {name: ~str, species: species}; @@ -323,18 +323,20 @@ mod test { let iter1 = 3u; let iter2 = 22u; - let read_port = oldcomm::Port(); - let read_chan = oldcomm::Chan(&read_port); + let (read_port, read_chan) = stream(); + let read_chan = SharedChan(read_chan); // fire up a reader task for uint::range(0u, iter1) |i| { s.reader_forked(); let (wait_port, wait_chan) = stream(); + let read_chan = read_chan.clone(); do task::spawn { + let read_chan = read_chan.clone(); for uint::range(0u, iter2) |_i| { - oldcomm::send(read_chan, henrietta.read(read_characteristic)); - oldcomm::send(read_chan, ferdinand.read(read_characteristic)); + read_chan.send(henrietta.read(read_characteristic)); + read_chan.send(ferdinand.read(read_characteristic)); wait_port.recv(); } } @@ -346,9 +348,9 @@ mod test { assert frc == i * iter2; for uint::range(0u, iter2) |_i| { - assert hrc == oldcomm::recv(read_port); + assert hrc == read_port.recv(); s.write(&henrietta, mutate); - assert frc == oldcomm::recv(read_port); + assert frc == read_port.recv(); s.write(&ferdinand, mutate); wait_chan.send(()); } diff --git a/src/sharegl b/src/sharegl index 355fdfa0e71..0beee76601f 160000 --- a/src/sharegl +++ b/src/sharegl @@ -1 +1 @@ -Subproject commit 355fdfa0e715ef7cc11156071c6b4fbcf4ede057 +Subproject commit 0beee76601f94c5601357c239e5e850266a47c2a