From 57a231ff943e5023d15323ab3aae36da30d5448c Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 4 Jul 2012 17:32:22 -0400 Subject: [PATCH] Build fixes for latest rustc changes. --- Makefile.in | 4 ++-- src/rust-azure | 2 +- src/rust-cocoa | 2 +- src/rust-harfbuzz | 2 +- src/rust-mozjs | 2 +- src/rust-sdl | 2 +- src/rust-stb-image | 2 +- src/servo/platform/osmain.rs | 4 ++-- src/servo/text/font.rs | 4 ++-- src/servo/text/native_font/quartz_native_font.rs | 9 +++++---- src/servo/text/shaper.rs | 10 +++++----- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Makefile.in b/Makefile.in index 23c4afd954f..6267361384f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,7 +90,7 @@ src/ragel/ragel/ragel: $(MAKE) -C src/ragel src/harfbuzz/src/.libs/libharfbuzz.a: src/ragel/ragel/ragel - $(MAKE) -C src/harfbuzz PATH=$(PATH):$(BUILD_DIR)/src/ragel/ragel CXXFLAGS=-fPIC LDFLAGS=-fPIC + $(MAKE) -C src/harfbuzz PATH=$(PATH):$(BUILD_DIR)/src/ragel/ragel CXXFLAGS=-fPIC LDFLAGS="-fPIC -lstdc++" src/mozjs/libjs_static.a: $(MAKE) -C src/mozjs @@ -133,7 +133,7 @@ check-rust-mozjs: src/mozjs/libjs_static.a .PHONY: check-rust-azure check-rust-azure: $(AZURE_DEPS) - RUSTFLAGS="-L ../rust-cocoa" $(MAKE) check -C src/rust-azure + RUSTFLAGS="-L ../rust-cocoa -L ../rust-geom" $(MAKE) check -C src/rust-azure .PHONY: check-rust-sdl check-rust-sdl: diff --git a/src/rust-azure b/src/rust-azure index 3c378322f2e..1e811d44daa 160000 --- a/src/rust-azure +++ b/src/rust-azure @@ -1 +1 @@ -Subproject commit 3c378322f2e61526e8f9dd5925b764c4420a2211 +Subproject commit 1e811d44daaf00a8b8ebf0e7ea3f39056da133da diff --git a/src/rust-cocoa b/src/rust-cocoa index a326b982dfd..2764790c795 160000 --- a/src/rust-cocoa +++ b/src/rust-cocoa @@ -1 +1 @@ -Subproject commit a326b982dfde133ea558a1025deb9c14d88265d2 +Subproject commit 2764790c7956b789af13f35568f3096b698cb501 diff --git a/src/rust-harfbuzz b/src/rust-harfbuzz index b6eb9169260..e1ce2a3bef6 160000 --- a/src/rust-harfbuzz +++ b/src/rust-harfbuzz @@ -1 +1 @@ -Subproject commit b6eb91692604522fb2823158bb570c025c878019 +Subproject commit e1ce2a3bef67f28ea6ddea68ac2cbba281b186c9 diff --git a/src/rust-mozjs b/src/rust-mozjs index 72d6aaed46c..4da8eb3717a 160000 --- a/src/rust-mozjs +++ b/src/rust-mozjs @@ -1 +1 @@ -Subproject commit 72d6aaed46caaef92f998fa2a90eed7745fcff12 +Subproject commit 4da8eb3717aa01daba896a736012e67585b90803 diff --git a/src/rust-sdl b/src/rust-sdl index 49e1fe02095..1f1f49d6e32 160000 --- a/src/rust-sdl +++ b/src/rust-sdl @@ -1 +1 @@ -Subproject commit 49e1fe02095136615fd913903d084f515d2064c0 +Subproject commit 1f1f49d6e32116734f1f45cb64498340e5e367ff diff --git a/src/rust-stb-image b/src/rust-stb-image index 455bb644ba2..2d87ae88486 160000 --- a/src/rust-stb-image +++ b/src/rust-stb-image @@ -1 +1 @@ -Subproject commit 455bb644ba20c36ce8de9fd82b94f477eea6db75 +Subproject commit 2d87ae88486ee1a438fa71d1199dd7bc987b17fa diff --git a/src/servo/platform/osmain.rs b/src/servo/platform/osmain.rs index 9dada23729b..6d0eab54989 100644 --- a/src/servo/platform/osmain.rs +++ b/src/servo/platform/osmain.rs @@ -284,13 +284,13 @@ mod platform { #debug("getting osmain fptr: %?", fptr); unsafe { - // FIXME: We probably don't want to run the main routine in a crust function + // FIXME: We probably don't want to run the main routine in a foreign function (*fptr)(); } } fn create(f: fn()) -> id { - let NSObject = str::as_c_str("NSObject", |s| ojc::objc_getClass(s)); + let NSObject = str::as_c_str("NSObject", |s| objc::objc_getClass(s)); let MainObj = str::as_c_str("MainObj", |s| { objc::objc_allocateClassPair(NSObject, s, 0 as libc::size_t) }); diff --git a/src/servo/text/font.rs b/src/servo/text/font.rs index 4a3a5ca1d2a..542c57e496e 100644 --- a/src/servo/text/font.rs +++ b/src/servo/text/font.rs @@ -222,7 +222,7 @@ mod cocoa { } #[cfg(target_os = "macos")] -fn get_cairo_face(buf: &[u8]) -> (*cairo_font_face_t, fn@()) { +fn get_cairo_face(buf: &~[u8]) -> (*cairo_font_face_t, fn@()) { import unsafe::reinterpret_cast; import libc::size_t; import cocoa::cocoa; @@ -296,7 +296,7 @@ fn should_get_glyph_advance() { fn should_be_able_to_create_instances_in_multiple_threads() { #[test]; - iter::repeat(10u, || task::spawn(|| {create_test_font();})); + for iter::repeat(10u) {do task::spawn {create_test_font();}} } fn get_cairo_face_should_fail_and_not_leak_if_font_cant_be_created() { diff --git a/src/servo/text/native_font/quartz_native_font.rs b/src/servo/text/native_font/quartz_native_font.rs index 5b56b3168ae..ec3bb335209 100644 --- a/src/servo/text/native_font/quartz_native_font.rs +++ b/src/servo/text/native_font/quartz_native_font.rs @@ -48,12 +48,12 @@ class QuartzNativeFont/& { } } -fn create(buf: &[u8]) -> result { - let fontprov = vec::as_buf(*buf, |cbuf| { +fn create(buf: [u8]) -> result { + let fontprov = vec::as_buf(buf, |cbuf| { CGDataProviderCreateWithData( null(), unsafe { reinterpret_cast(cbuf) }, - (*buf).len() as size_t, + buf.len() as size_t, null()) }); // FIXME: Error handling @@ -70,6 +70,7 @@ fn with_test_native_font(f: fn@(nf: &NativeFont)) { import unwrap_result = result::unwrap; let buf = test_font_bin(); - let font = unwrap_result(create(&buf)); + let res = create(buf); + let font = unwrap_result(res); f(&font); } diff --git a/src/servo/text/shaper.rs b/src/servo/text/shaper.rs index 0a0dfdfd422..c602171a413 100644 --- a/src/servo/text/shaper.rs +++ b/src/servo/text/shaper.rs @@ -102,11 +102,11 @@ fn shape_text(font: &Font, text: str) -> [Glyph] unsafe { } extern fn glyph_func(_font: *hb_font_t, - font_data: *c_void, - unicode: hb_codepoint_t, - _variant_selector: hb_codepoint_t, - glyph: *mut hb_codepoint_t, - _user_data: *c_void) -> hb_bool_t unsafe { + font_data: *c_void, + unicode: hb_codepoint_t, + _variant_selector: hb_codepoint_t, + glyph: *mut hb_codepoint_t, + _user_data: *c_void) -> hb_bool_t unsafe { let font: *Font = reinterpret_cast(font_data); assert font.is_not_null();