From a52818978d9e6aefa1189b9c481ac121e2c8ec79 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 16 Aug 2012 15:24:19 -0700 Subject: [PATCH] Fix some breakage --- src/servo/content.rs | 12 ++++++------ src/servo/dom/base.rs | 4 ++-- src/servo/dom/rcu.rs | 2 +- src/servo/engine.rs | 4 ++-- src/servo/gfx/renderer.rs | 8 ++++---- src/servo/image/encode/tga.rs | 4 ++-- src/servo/layout/display_list.rs | 4 ++-- src/servo/layout/display_list_builder.rs | 2 +- src/servo/parser/css_lexer.rs | 4 ++-- src/servo/parser/html_builder.rs | 8 ++++---- src/servo/platform/osmain.rs | 18 +++++++++--------- src/servo/servo.rs | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/servo/content.rs b/src/servo/content.rs index 718f9ae36b0..24b2351977f 100644 --- a/src/servo/content.rs +++ b/src/servo/content.rs @@ -29,7 +29,7 @@ import jsrt = js::rust::rt; import js::rust::methods; import js::global::{global_class, debug_fns}; -import either::{either, left, right}; +import either::{Either, Left, Right}; import dom::bindings::utils::rust_box; import js::rust::compartment; @@ -77,8 +77,8 @@ class Document { class Content { let sink: S; let layout: Layout; - let from_master: comm::port; - let event_port: comm::port; + let from_master: comm::Port; + let event_port: comm::Port; let scope: NodeScope; let jsrt: jsrt; @@ -111,10 +111,10 @@ class Content { } } - fn handle_msg(msg: either) -> bool { + fn handle_msg(msg: Either) -> bool { match msg { - left(control_msg) => self.handle_control_msg(control_msg), - right(event) => self.handle_event(event) + Left(control_msg) => self.handle_control_msg(control_msg), + Right(event) => self.handle_event(event) } } diff --git a/src/servo/dom/base.rs b/src/servo/dom/base.rs index 91f2bd1e7fe..37e1fd5fd05 100644 --- a/src/servo/dom/base.rs +++ b/src/servo/dom/base.rs @@ -9,7 +9,7 @@ import js::jsapi::{JSClass, JSObject, JSPropertySpec, JSContext, jsid, jsval, JS import js::{JSPROP_ENUMERATE, JSPROP_SHARED}; import js::crust::*; import js::glue::bindgen::RUST_OBJECT_TO_JSVAL; -import dvec::dvec; +import dvec::{DVec, dvec}; import ptr::null; import content::Document; import bindings; @@ -27,7 +27,7 @@ enum NodeKind { class ElementData { let tag_name: ~str; let kind: ~ElementKind; - let attrs: dvec<~Attr>; + let attrs: DVec<~Attr>; new(-tag_name: ~str, -kind: ~ElementKind) { self.tag_name = tag_name; diff --git a/src/servo/dom/rcu.rs b/src/servo/dom/rcu.rs index b012777f117..804c27d0bc9 100644 --- a/src/servo/dom/rcu.rs +++ b/src/servo/dom/rcu.rs @@ -50,7 +50,7 @@ of the RCU nodes themselves. ")]; import core::libc::types::os::arch::c95::size_t; -import ptr::ptr; +import ptr::Ptr; import vec::push; export Handle; diff --git a/src/servo/engine.rs b/src/servo/engine.rs index 28ca5e5d051..0b1642597c2 100644 --- a/src/servo/engine.rs +++ b/src/servo/engine.rs @@ -19,7 +19,7 @@ class Engine { let resource_task: ResourceTask; let image_cache_task: ImageCacheTask; let layout: Layout; - let content: comm::chan; + let content: comm::Chan; new(+sink: S) { self.sink = sink; @@ -37,7 +37,7 @@ class Engine { self.content = content; } - fn start() -> comm::chan { + fn start() -> comm::Chan { do spawn_listener:: |request| { while self.handle_request(request.recv()) { // Go on... diff --git a/src/servo/gfx/renderer.rs b/src/servo/gfx/renderer.rs index b0c4d3fe605..1a744437021 100644 --- a/src/servo/gfx/renderer.rs +++ b/src/servo/gfx/renderer.rs @@ -19,7 +19,7 @@ import azure::cairo::{cairo_font_face_t, cairo_scaled_font_t}; import pipes::{port, chan}; -type Renderer = comm::chan; +type Renderer = comm::Chan; enum Msg { RenderMsg(dl::display_list), @@ -35,11 +35,11 @@ FIXME: Change this name to Compositor. trait Sink { fn begin_drawing(+next_dt: pipes::chan); fn draw(+next_dt: pipes::chan, draw_me: AzDrawTargetRef); - fn add_event_listener(listener: comm::chan); + fn add_event_listener(listener: comm::Chan); } -fn Renderer(sink: S) -> comm::chan { - do task::spawn_listener |po: comm::port| { +fn Renderer(sink: S) -> comm::Chan { + do task::spawn_listener |po: comm::Port| { let (draw_target_ch, draw_target_po) = pipes::stream(); let mut draw_target_ch = draw_target_ch; let mut draw_target_po = draw_target_po; diff --git a/src/servo/image/encode/tga.rs b/src/servo/image/encode/tga.rs index 4e3836bf298..9bc8a27e81f 100644 --- a/src/servo/image/encode/tga.rs +++ b/src/servo/image/encode/tga.rs @@ -1,7 +1,7 @@ import gfx::surface; -import io::writer_util; +import io::WriterUtil; -fn encode(writer: io::writer, surface: surface::image_surface) { +fn encode(writer: io::Writer, surface: surface::image_surface) { assert surface.format == gfx::surface::fo_rgba_8888; writer.write_u8(0u8); // identsize diff --git a/src/servo/layout/display_list.rs b/src/servo/layout/display_list.rs index 9e9ef689e21..34694b131fa 100644 --- a/src/servo/layout/display_list.rs +++ b/src/servo/layout/display_list.rs @@ -4,7 +4,7 @@ import image::base::Image; import servo_text::text_run::TextRun; import std::arc::arc; -import dvec::dvec; +import dvec::DVec; enum item_type { display_item_solid_color(u8, u8, u8), @@ -19,4 +19,4 @@ enum display_item = { bounds: Rect }; -type display_list = dvec; +type display_list = DVec; diff --git a/src/servo/layout/display_list_builder.rs b/src/servo/layout/display_list_builder.rs index 988be2a3a5b..044e4ce2e7c 100644 --- a/src/servo/layout/display_list_builder.rs +++ b/src/servo/layout/display_list_builder.rs @@ -4,7 +4,7 @@ import base::{Box, BTree, ImageHolder, TextBoxKind}; import dl = display_list; import dom::base::{Text, NodeScope}; import dom::rcu::Scope; -import either::{left, right}; +import either::{Left, Right}; import geom::point::Point2D; import geom::rect::Rect; import geom::size::Size2D; diff --git a/src/servo/parser/css_lexer.rs b/src/servo/parser/css_lexer.rs index 2fe45487ecb..e76149278b1 100644 --- a/src/servo/parser/css_lexer.rs +++ b/src/servo/parser/css_lexer.rs @@ -227,7 +227,7 @@ impl CssLexer : CssLexerMethods { } } -fn parser(input_port: comm::port, state : ParserState) -> CssLexer { +fn parser(input_port: comm::Port, state : ParserState) -> CssLexer { return { input_state: { mut lookahead: none, @@ -239,7 +239,7 @@ fn parser(input_port: comm::port, state : ParserState) -> CssLexer }; } -fn lex_css_from_bytes(+input_port: comm::port, result_chan : chan) { +fn lex_css_from_bytes(+input_port: comm::Port, result_chan : chan) { let lexer = parser(input_port, CssElement); loop { diff --git a/src/servo/parser/html_builder.rs b/src/servo/parser/html_builder.rs index f2227ec92be..31dd3a93bae 100644 --- a/src/servo/parser/html_builder.rs +++ b/src/servo/parser/html_builder.rs @@ -93,7 +93,7 @@ spawned, collates them, and sends them to the given result channel. * `from_parent` - A port on which to receive new links. "] -fn css_link_listener(to_parent : comm::chan, from_parent : comm::port, +fn css_link_listener(to_parent : comm::Chan, from_parent : comm::Port, resource_task: ResourceTask) { let mut result_vec = ~[]; @@ -124,7 +124,7 @@ fn css_link_listener(to_parent : comm::chan, from_parent : comm::por to_parent.send(css_rules); } -fn js_script_listener(to_parent : comm::chan<~[~[u8]]>, from_parent : comm::port, +fn js_script_listener(to_parent : comm::Chan<~[~[u8]]>, from_parent : comm::Port, resource_task: ResourceTask) { let mut result_vec = ~[]; @@ -169,8 +169,8 @@ fn js_script_listener(to_parent : comm::chan<~[~[u8]]>, from_parent : comm::port } #[allow(non_implicitly_copyable_typarams)] -fn build_dom(scope: NodeScope, stream: comm::port, url: url, - resource_task: ResourceTask) -> (Node, comm::port, comm::port<~[~[u8]]>) { +fn build_dom(scope: NodeScope, stream: comm::Port, url: url, + resource_task: ResourceTask) -> (Node, comm::Port, comm::Port<~[~[u8]]>) { // The current reference node. let mut cur_node = scope.new_node(Element(ElementData(~"html", ~HTMLDivElement))); // We will spawn a separate task to parse any css that is diff --git a/src/servo/platform/osmain.rs b/src/servo/platform/osmain.rs index ac76912f0dd..7d1fe3b7677 100644 --- a/src/servo/platform/osmain.rs +++ b/src/servo/platform/osmain.rs @@ -8,25 +8,25 @@ import azure::cairo; import azure::cairo::bindgen::*; import azure::cairo_hl::ImageSurface; import comm::*; -import dvec::dvec; +import dvec::{DVec, dvec}; import azure::cairo::cairo_surface_t; import gfx::renderer::Sink; import dom::event::{Event, ResizeEvent}; import layers::ImageLayer; import geom::size::Size2D; import std::cmp::fuzzy_eq; -import task::task_builder; +import task::TaskBuilder; import vec::push; import pipes::chan; -type OSMain = comm::chan; +type OSMain = comm::Chan; enum Msg { BeginDrawing(pipes::chan), Draw(pipes::chan, AzDrawTargetRef), AddKeyHandler(pipes::chan<()>), - AddEventListener(comm::chan), + AddEventListener(comm::Chan), Exit } @@ -40,8 +40,8 @@ fn OSMain() -> OSMain { } fn mainloop(po: port) { - let key_handlers: @dvec> = @dvec(); - let event_listeners: @dvec> = @dvec(); + let key_handlers: @DVec> = @dvec(); + let event_listeners: @DVec> = @dvec(); glut::init(); glut::init_display_mode(glut::DOUBLE); @@ -131,7 +131,7 @@ impl OSMain : Sink { fn draw(+next_dt: pipes::chan, draw_me: AzDrawTargetRef) { self.send(Draw(next_dt, draw_me)) } - fn add_event_listener(listener: comm::chan) { + fn add_event_listener(listener: comm::Chan) { self.send(AddEventListener(listener)); } } @@ -186,8 +186,8 @@ fn Surface() -> Surface { } #[doc = "A function for spawning into the platform's main thread"] -fn on_osmain(+f: fn~(comm::port)) -> comm::chan { - task::task().sched_mode(task::platform_thread).spawn_listener(f) +fn on_osmain(+f: fn~(comm::Port)) -> comm::Chan { + task::task().sched_mode(task::PlatformThread).spawn_listener(f) } // #[cfg(target_os = "linux")] diff --git a/src/servo/servo.rs b/src/servo/servo.rs index acda36e728e..521456b6e9d 100644 --- a/src/servo/servo.rs +++ b/src/servo/servo.rs @@ -68,7 +68,7 @@ fn run_pipeline_png(-url: ~str, outfile: ~str) { import gfx::pngsink; import pngsink::PngSink; import result::{ok, err}; - import io::{writer, buffered_file_writer}; + import io::{Writer, buffered_file_writer}; listen(|pngdata_from_sink| { let sink = PngSink(pngdata_from_sink);