diff --git a/src/rust-azure b/src/rust-azure index 94931108530..34a6c78cce4 160000 --- a/src/rust-azure +++ b/src/rust-azure @@ -1 +1 @@ -Subproject commit 949311085306aa9a0a31698dc001f8a3c5dfe798 +Subproject commit 34a6c78cce40e9e01f330cf1324672d65d94a97b diff --git a/src/rust-http-client b/src/rust-http-client index 398b829caf6..c99d5825e3a 160000 --- a/src/rust-http-client +++ b/src/rust-http-client @@ -1 +1 @@ -Subproject commit 398b829caf64e1e809da4f387976ff359368127b +Subproject commit c99d5825e3a7ad782acfad82cc17d3a2fea0e39b diff --git a/src/rust-layers b/src/rust-layers index 412e8ec6982..51832ea94b0 160000 --- a/src/rust-layers +++ b/src/rust-layers @@ -1 +1 @@ -Subproject commit 412e8ec69827031b59af4e35215c6b18fd25e8be +Subproject commit 51832ea94b0ffcd21b6bfba37ad969284c41a07b diff --git a/src/servo/resource/resource_task.rs b/src/servo/resource/resource_task.rs index 7dc58137c25..4c20a49d4a8 100644 --- a/src/servo/resource/resource_task.rs +++ b/src/servo/resource/resource_task.rs @@ -10,6 +10,7 @@ export ResourceTask, ResourceManager, LoaderTaskFactory; import comm::{Chan, Port}; import task::{spawn, spawn_listener}; +import std::net::url; import std::net::url::{Url, to_str}; enum ControlMsg { @@ -136,7 +137,7 @@ fn test_bad_scheme() { #[allow(non_implicitly_copyable_typarams)] fn should_delegate_to_scheme_loader() { let payload = ~[1, 2, 3]; - let loader_factory = fn~(+_url: url, progress_chan: Chan, copy payload) { + let loader_factory = fn~(+_url: Url, progress_chan: Chan, copy payload) { progress_chan.send(Payload(copy payload)); progress_chan.send(Done(Ok(()))); }; diff --git a/src/servo/text/native_font/ft_native_font.rs b/src/servo/text/native_font/ft_native_font.rs index e9343e14b68..3761ff6ac76 100644 --- a/src/servo/text/native_font/ft_native_font.rs +++ b/src/servo/text/native_font/ft_native_font.rs @@ -49,7 +49,7 @@ struct FreeTypeNativeFont/& { if res.succeeded() { unsafe { let void_glyph = (*self.face).glyph; - let slot: FT_GlyphSlot = reinterpret_cast(void_glyph); + let slot: FT_GlyphSlot = reinterpret_cast(&void_glyph); assert slot.is_not_null(); let advance = (*slot).metrics.horiAdvance; #debug("h_advance for %? is %?", glyph, advance);