aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------src/rust-azure0
m---------src/rust-cocoa0
m---------src/rust-core-foundation0
m---------src/rust-geom0
m---------src/rust-glut0
m---------src/rust-harfbuzz0
m---------src/rust-http-client0
m---------src/rust-hubbub0
m---------src/rust-layers0
m---------src/rust-mozjs0
m---------src/rust-opengles0
m---------src/rust-stb-image0
-rw-r--r--src/servo/dom/bindings/document.rs2
-rw-r--r--src/servo/dom/bindings/element.rs4
-rw-r--r--src/servo/dom/bindings/node.rs2
-rw-r--r--src/servo/dom/bindings/utils.rs2
-rw-r--r--src/servo/dom/bindings/window.rs2
-rw-r--r--src/servo/gfx/png_compositor.rs4
-rw-r--r--src/servo/gfx/render_task.rs2
-rwxr-xr-xsrc/servo/servo.rc20
-rw-r--r--src/servo/text/font.rs2
-rw-r--r--src/servo/text/native_font/quartz_native_font.rs10
-rw-r--r--src/servo/text/shaper.rs4
23 files changed, 27 insertions, 27 deletions
diff --git a/src/rust-azure b/src/rust-azure
-Subproject 85b33524fb4190be04cd4f7e2a0b80afc162c24
+Subproject 7ecba6aa7afd69ad970b2a041367a295d830799
diff --git a/src/rust-cocoa b/src/rust-cocoa
-Subproject 8a44a579cf421b6bc7a97b1c1e81bd9ede5d84a
+Subproject 5019635e3f44851c08716bd44b70229b2d625aa
diff --git a/src/rust-core-foundation b/src/rust-core-foundation
-Subproject 97addf5f319171f3318129bdd47fbee264c983b
+Subproject f0bda24a03245e2f917b287d5d850621d2d56c5
diff --git a/src/rust-geom b/src/rust-geom
-Subproject b21169d50a7a69dd77a15edfef37d552dd0a4a8
+Subproject e1ec99049c193aaedbb603e4ceb675251e5814b
diff --git a/src/rust-glut b/src/rust-glut
-Subproject 2ac740959ba4560141ae6b45a2a1d175fa9c6b4
+Subproject 43dff406cc21f46a2b14707ecfe347be149b375
diff --git a/src/rust-harfbuzz b/src/rust-harfbuzz
-Subproject 889260799c84f2e3bb23f44927a902dfd430abf
+Subproject fa1de008eb31d9401dbc3d6232d6fa4e87d54da
diff --git a/src/rust-http-client b/src/rust-http-client
-Subproject 705cea457cc490794439fd2fdb38d154a3bed65
+Subproject 402d663658c6f10da2769fa9cbd406160bc89e6
diff --git a/src/rust-hubbub b/src/rust-hubbub
-Subproject 18375fd31cde66d0f0204de8c6c15870ca32b05
+Subproject 425d4598525f43de331c017f0c8408954dcbd66
diff --git a/src/rust-layers b/src/rust-layers
-Subproject f36b299ef516e9c8d22eb162986b9f6e266c976
+Subproject 4ff373b328f646d1ff1c9e67337bd284ff0fddd
diff --git a/src/rust-mozjs b/src/rust-mozjs
-Subproject c74cefb9dc45f577b6f174c6a7fe83bfcf3f150
+Subproject de66662c301b2c00dacabdf0d82adf22d16232b
diff --git a/src/rust-opengles b/src/rust-opengles
-Subproject 9b1ecfc7a889bf0f8f2fca63a4634767f7704f4
+Subproject 7a847f44e8fe93f16749fade574c8e76d51b2b6
diff --git a/src/rust-stb-image b/src/rust-stb-image
-Subproject 6d727c72da467c70852610f8c7899b2d795b59e
+Subproject 60b6a4ec1d2bd63b24383fe31865552d7eedada
diff --git a/src/servo/dom/bindings/document.rs b/src/servo/dom/bindings/document.rs
index 7b3ecd0a9a7..f6f0202c515 100644
--- a/src/servo/dom/bindings/document.rs
+++ b/src/servo/dom/bindings/document.rs
@@ -97,7 +97,7 @@ fn init(compartment: bare_compartment, doc: @Document) {
getter: {op: getDocumentElement, info: null()},
setter: {op: null(), info: null()}}];
vec::push(compartment.global_props, attrs);
- vec::as_buf(*attrs, |specs, _len| {
+ vec::as_imm_buf(*attrs, |specs, _len| {
assert JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs) == 1;
});
diff --git a/src/servo/dom/bindings/element.rs b/src/servo/dom/bindings/element.rs
index 3347b6e95dc..e5729089dd9 100644
--- a/src/servo/dom/bindings/element.rs
+++ b/src/servo/dom/bindings/element.rs
@@ -36,7 +36,7 @@ fn init(compartment: bare_compartment) {
getter: {op: getTagName, info: null()},
setter: {op: null(), info: null()}}];
vec::push(compartment.global_props, attrs);
- vec::as_buf(*attrs, |specs, _len| {
+ vec::as_imm_buf(*attrs, |specs, _len| {
JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs);
});
@@ -56,7 +56,7 @@ fn init(compartment: bare_compartment) {
getter: {op: HTMLImageElement_getWidth, info: null()},
setter: {op: HTMLImageElement_setWidth, info: null()}}];
vec::push(compartment.global_props, attrs);
- vec::as_buf(*attrs, |specs, _len| {
+ vec::as_imm_buf(*attrs, |specs, _len| {
JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs);
});
}
diff --git a/src/servo/dom/bindings/node.rs b/src/servo/dom/bindings/node.rs
index a6a9c214710..94d4d65036e 100644
--- a/src/servo/dom/bindings/node.rs
+++ b/src/servo/dom/bindings/node.rs
@@ -36,7 +36,7 @@ fn init(compartment: bare_compartment) {
getter: {op: getNodeType, info: null()},
setter: {op: null(), info: null()}}];
vec::push(compartment.global_props, attrs);
- vec::as_buf(*attrs, |specs, _len| {
+ vec::as_imm_buf(*attrs, |specs, _len| {
JS_DefineProperties(compartment.cx.ptr, obj.ptr, specs);
});
}
diff --git a/src/servo/dom/bindings/utils.rs b/src/servo/dom/bindings/utils.rs
index bbb546fa067..dd7d89e4018 100644
--- a/src/servo/dom/bindings/utils.rs
+++ b/src/servo/dom/bindings/utils.rs
@@ -50,7 +50,7 @@ fn jsval_to_str(cx: *JSContext, v: jsval) -> Result<~str, ()> {
Err(())
} else {
unsafe {
- let buf = vec::unsafe::from_buf(chars as *u8, len as uint);
+ let buf = vec::raw::from_buf(chars as *u8, len as uint);
Ok(str::from_bytes(buf))
}
}
diff --git a/src/servo/dom/bindings/window.rs b/src/servo/dom/bindings/window.rs
index 1fbf88fcfb2..bccc65599a2 100644
--- a/src/servo/dom/bindings/window.rs
+++ b/src/servo/dom/bindings/window.rs
@@ -103,7 +103,7 @@ fn init(compartment: bare_compartment, win: @Window) {
flags: 0,
selfHostedName: null()}];
- vec::as_buf(methods, |fns, _len| {
+ vec::as_imm_buf(methods, |fns, _len| {
JS_DefineFunctions(compartment.cx.ptr, proto.ptr, fns);
});
diff --git a/src/servo/gfx/png_compositor.rs b/src/servo/gfx/png_compositor.rs
index 7caae7dab54..76f9ec1b9db 100644
--- a/src/servo/gfx/png_compositor.rs
+++ b/src/servo/gfx/png_compositor.rs
@@ -20,7 +20,7 @@ use render_task::{RenderTask, RenderMsg};
use task::spawn_listener;
use comm::{Chan, Port};
use unsafe::reinterpret_cast;
-use vec_from_buf = vec::unsafe::from_buf;
+use vec_from_buf = vec::raw::from_buf;
use ptr::addr_of;
use dom::event::Event;
use dvec::DVec;
@@ -75,7 +75,7 @@ fn do_draw(sender: pipes::Chan<DrawTarget>,
let buffer = io::mem_buffer();
cairo_surface.write_to_png_stream(&buffer);
let @{ buf: buffer, pos: _ } <- buffer;
- output.send(vec::from_mut(dvec::unwrap(move buffer)));
+ output.send(dvec::unwrap(move buffer));
// Send the next draw target to the renderer
sender.send(move dt);
diff --git a/src/servo/gfx/render_task.rs b/src/servo/gfx/render_task.rs
index 75263388fb6..d165a628764 100644
--- a/src/servo/gfx/render_task.rs
+++ b/src/servo/gfx/render_task.rs
@@ -120,7 +120,7 @@ pub fn draw_image(draw_target: &DrawTarget, bounds: Rect<au>, image: ARC<~Image>
pub fn draw_text(draw_target: &DrawTarget, bounds: Rect<au>, text_run: &TextRun) {
use ptr::{addr_of, null};
- use vec::unsafe::to_ptr;
+ use vec::raw::to_ptr;
use libc::types::common::c99::{uint16_t, uint32_t};
use geom::point::Point2D;
use text::font_library::FontLibrary;
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index c99020d6665..ed7a9fbbb9b 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -7,16 +7,16 @@
#[license = "MPL"];
#[crate_type = "lib"];
-use std;
-use azure;
-use js;
-use stb_image;
-use geom;
-use glut;
-use layers;
-use opengles;
-use http_client;
-use hubbub;
+extern mod std;
+extern mod azure;
+extern mod js;
+extern mod stb_image;
+extern mod geom;
+extern mod glut;
+extern mod layers;
+extern mod opengles;
+extern mod http_client;
+extern mod hubbub;
mod engine;
diff --git a/src/servo/text/font.rs b/src/servo/text/font.rs
index 2e2e3d08f8c..9b76fd06729 100644
--- a/src/servo/text/font.rs
+++ b/src/servo/text/font.rs
@@ -1,7 +1,7 @@
export Font, test_font_bin, create_test_font;
use glyph::GlyphIndex;
-use vec_to_ptr = vec::unsafe::to_ptr;
+use vec_to_ptr = vec::raw::to_ptr;
use libc::{ c_int, c_double, c_ulong };
use ptr::{ null, addr_of };
use native_font::NativeFont;
diff --git a/src/servo/text/native_font/quartz_native_font.rs b/src/servo/text/native_font/quartz_native_font.rs
index 1864b3848bf..0745b0e076a 100644
--- a/src/servo/text/native_font/quartz_native_font.rs
+++ b/src/servo/text/native_font/quartz_native_font.rs
@@ -1,4 +1,4 @@
-use cocoa;
+extern mod cocoa;
export QuartzNativeFont, with_test_native_font, create;
@@ -84,8 +84,8 @@ impl QuartzNativeFont {
let glyphs: ~[mut CGGlyph] = ~[mut 0 as CGGlyph];
let count: CFIndex = 1;
- let result = do vec::as_buf(characters) |character_buf, _l| {
- do vec::as_buf(glyphs) |glyph_buf, _l| {
+ let result = do vec::as_imm_buf(characters) |character_buf, _l| {
+ do vec::as_imm_buf(glyphs) |glyph_buf, _l| {
CTFontGetGlyphsForCharacters(ctfont, character_buf, glyph_buf, count)
}
};
@@ -109,7 +109,7 @@ impl QuartzNativeFont {
let ctfont = ctfont_from_cgfont(self.cgfont);
assert ctfont.is_not_null();
let glyphs = ~[glyph as CGGlyph];
- let advance = do vec::as_buf(glyphs) |glyph_buf, _l| {
+ let advance = do vec::as_imm_buf(glyphs) |glyph_buf, _l| {
CTFontGetAdvancesForGlyphs(ctfont, kCTFontDefaultOrientation, glyph_buf, null(), 1)
};
@@ -128,7 +128,7 @@ fn ctfont_from_cgfont(cgfont: CGFontRef) -> coretext::CTFontRef {
}
fn create(buf: &~[u8]) -> Result<QuartzNativeFont, ()> {
- let fontprov = vec::as_buf(*buf, |cbuf, len| {
+ let fontprov = vec::as_imm_buf(*buf, |cbuf, len| {
CGDataProviderCreateWithData(
null(),
unsafe { transmute(copy cbuf) },
diff --git a/src/servo/text/shaper.rs b/src/servo/text/shaper.rs
index e2a269e22fd..34ef962572c 100644
--- a/src/servo/text/shaper.rs
+++ b/src/servo/text/shaper.rs
@@ -1,4 +1,4 @@
-use harfbuzz;
+extern mod harfbuzz;
export shape_text;
@@ -39,7 +39,7 @@ when rendered in a specific font.
fn shape_text(font: &Font, text: ~str) -> ~[Glyph] unsafe {
#debug("shaping text '%s'", text);
- let face_blob = vec::as_buf(*(*font).buf(), |buf, len| {
+ let face_blob = vec::as_imm_buf(*(*font).buf(), |buf, len| {
hb_blob_create(reinterpret_cast(&buf),
len as c_uint,
HB_MEMORY_MODE_READONLY,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 08:09:09 +0000