From b451ff3e15bdc5fafa7e531b5904118ded07a9d5 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 29 Oct 2013 14:55:17 -0700 Subject: [PATCH] Other language changes --- src/components/gfx/gfx.rc | 2 +- src/components/main/layout/inline.rs | 28 +++++++++------------ src/components/main/pipeline.rs | 7 +++--- src/components/main/servo.rc | 2 +- src/components/net/file_loader.rs | 16 +++++++----- src/components/net/image/base.rs | 4 +-- src/components/net/net.rc | 2 +- src/components/script/dom/window.rs | 3 +-- src/components/script/script.rc | 2 +- src/components/style/style.rc | 2 +- src/components/util/debug.rs | 16 ++++++------ src/components/util/util.rc | 2 +- src/test/harness/contenttest/contenttest.rs | 4 +-- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/components/gfx/gfx.rc b/src/components/gfx/gfx.rc index 0a2f2ff7cc3..e803ccd2192 100644 --- a/src/components/gfx/gfx.rc +++ b/src/components/gfx/gfx.rc @@ -8,7 +8,7 @@ url = "http://servo.org/")]; #[crate_type = "lib"]; -#[feature(globs)]; +#[feature(globs, managed_boxes)]; extern mod azure; extern mod extra; diff --git a/src/components/main/layout/inline.rs b/src/components/main/layout/inline.rs index 47a47587816..a15f739ba05 100644 --- a/src/components/main/layout/inline.rs +++ b/src/components/main/layout/inline.rs @@ -530,24 +530,20 @@ impl FlowContext for InlineFlow { child_base.floats_in = FloatContext::new(child_base.num_floats); } - { - let this = &mut *self; + let mut min_width = Au::new(0); + let mut pref_width = Au::new(0); - let mut min_width = Au::new(0); - let mut pref_width = Au::new(0); - - for box in this.boxes.iter() { - debug!("FlowContext[{:d}]: measuring {:s}", self.base.id, box.debug_str()); - let (this_minimum_width, this_preferred_width) = - box.minimum_and_preferred_widths(); - min_width = Au::max(min_width, this_minimum_width); - pref_width = Au::max(pref_width, this_preferred_width); - } - - this.base.min_width = min_width; - this.base.pref_width = pref_width; - this.base.num_floats = num_floats; + for box in self.boxes.iter() { + debug!("FlowContext[{:d}]: measuring {:s}", self.base.id, box.debug_str()); + let (this_minimum_width, this_preferred_width) = + box.minimum_and_preferred_widths(); + min_width = Au::max(min_width, this_minimum_width); + pref_width = Au::max(pref_width, this_preferred_width); } + + self.base.min_width = min_width; + self.base.pref_width = pref_width; + self.base.num_floats = num_floats; } /// Recursively (top-down) determines the actual width of child contexts and boxes. When called diff --git a/src/components/main/pipeline.rs b/src/components/main/pipeline.rs index 9c89a07fb4e..7b619de378a 100644 --- a/src/components/main/pipeline.rs +++ b/src/components/main/pipeline.rs @@ -101,9 +101,8 @@ impl Pipeline { // Wrap task creation within a supervised task so that failure will // only tear down those tasks instead of ours. let failure_chan = constellation_chan.clone(); - let (task_port, task_chan) = stream::(); let mut supervised_task = task::task(); - supervised_task.opts.notify_chan = Some(task_chan); + let task_port = supervised_task.future_result(); supervised_task.supervised(); spawn_with!(supervised_task, [script_port, resource_task, size, render_port, @@ -138,8 +137,8 @@ impl Pipeline { spawn_with!(task::task(), [failure_chan], { match task_port.recv() { - task::Success => (), - task::Failure => { + Ok(*) => (), + Err(*) => { failure_chan.send(FailureMsg(id, subpage_id)); } } diff --git a/src/components/main/servo.rc b/src/components/main/servo.rc index f09114c4080..268878167b0 100755 --- a/src/components/main/servo.rc +++ b/src/components/main/servo.rc @@ -11,7 +11,7 @@ #[license = "MPL"]; #[crate_type = "lib"]; -#[feature(globs, macro_rules)]; +#[feature(globs, macro_rules, managed_boxes)]; extern mod alert; extern mod azure; diff --git a/src/components/net/file_loader.rs b/src/components/net/file_loader.rs index 40588cad275..379cd3e5ffb 100644 --- a/src/components/net/file_loader.rs +++ b/src/components/net/file_loader.rs @@ -3,8 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use resource_task::{Metadata, Payload, Done, LoaderTask, start_sending}; +use servo_util::io::ignoring_eof; -use std::io::{ReaderUtil, file_reader}; +use std::rt::io; +use std::rt::io::Reader; use std::task; static READ_SIZE: uint = 1024; @@ -14,15 +16,17 @@ pub fn factory() -> LoaderTask { assert!("file" == url.scheme); let progress_chan = start_sending(start_chan, Metadata::default(url.clone())); do task::spawn { - match file_reader(&from_str(url.path).unwrap()) { - Ok(reader) => { + match io::file::open(&url.path.as_slice(), io::Open, io::Read) { + Some(mut reader) => { while !reader.eof() { - let data = reader.read_bytes(READ_SIZE); - progress_chan.send(Payload(data)); + do ignoring_eof { + let data = reader.read_bytes(READ_SIZE); + progress_chan.send(Payload(data)); + } } progress_chan.send(Done(Ok(()))); } - Err(*) => { + None => { progress_chan.send(Done(Err(()))); } }; diff --git a/src/components/net/image/base.rs b/src/components/net/image/base.rs index 69214cede15..7b2bbe2f22b 100644 --- a/src/components/net/image/base.rs +++ b/src/components/net/image/base.rs @@ -14,10 +14,10 @@ pub fn Image(width: uint, height: uint, depth: uint, data: ~[u8]) -> Image { stb_image::new_image(width, height, depth, data) } -static TEST_IMAGE: [u8, ..4962] = include_bin!("test.jpeg"); +static TEST_IMAGE: &'static [u8] = include_bin!("test.jpeg"); pub fn test_image_bin() -> ~[u8] { - return vec::from_fn(4962, |i| TEST_IMAGE[i]); + TEST_IMAGE.into_owned() } pub fn load_from_memory(buffer: &[u8]) -> Option { diff --git a/src/components/net/net.rc b/src/components/net/net.rc index 623a530cecb..b8df8855e31 100644 --- a/src/components/net/net.rc +++ b/src/components/net/net.rc @@ -8,7 +8,7 @@ url = "http://servo.org/")]; #[crate_type = "lib"]; -#[feature(globs)]; +#[feature(globs, managed_boxes)]; extern mod geom; extern mod http; diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index d59c9a34ef9..0a5bb19d3ec 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -23,7 +23,6 @@ use std::cell::Cell; use std::comm; use std::comm::SharedChan; use std::hashmap::HashSet; -use std::io; use std::ptr; use std::int; use std::libc; @@ -74,7 +73,7 @@ pub struct TimerData { impl Window { pub fn Alert(&self, s: &DOMString) { // Right now, just print to the console - io::println(format!("ALERT: {:s}", null_str_as_empty(s))); + println(format!("ALERT: {:s}", null_str_as_empty(s))); } pub fn Close(&self) { diff --git a/src/components/script/script.rc b/src/components/script/script.rc index cf376f08fcd..bef239a5ec9 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -11,7 +11,7 @@ #[license = "MPL"]; #[crate_type = "lib"]; -#[feature(globs, macro_rules, struct_variant)]; +#[feature(globs, macro_rules, struct_variant, managed_boxes)]; extern mod geom; extern mod gfx (name = "gfx"); diff --git a/src/components/style/style.rc b/src/components/style/style.rc index d005e81bd70..6fe31302f7c 100644 --- a/src/components/style/style.rc +++ b/src/components/style/style.rc @@ -11,7 +11,7 @@ #[license = "MPL"]; #[crate_type = "lib"]; -#[feature(globs, macro_rules)]; +#[feature(globs, macro_rules, managed_boxes)]; extern mod extra; extern mod cssparser; diff --git a/src/components/util/debug.rs b/src/components/util/debug.rs index 6651bd1e024..5c9aa700d5b 100644 --- a/src/components/util/debug.rs +++ b/src/components/util/debug.rs @@ -2,24 +2,26 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use std::io; +use std::rt::io; +use std::rt::io::Writer; use std::vec::raw::buf_as_slice; use std::cast::transmute; use std::mem::size_of; fn hexdump_slice(buf: &[u8]) { - let stderr = io::stderr(); - stderr.write_str(" "); + let mut stderr = io::stderr(); + stderr.write(bytes!(" ")); for (i, &v) in buf.iter().enumerate() { - stderr.write_str(format!("{:02X} ", v as uint)); + let output = format!("{:02X} ", v as uint); + stderr.write(output.as_bytes()); match i % 16 { - 15 => stderr.write_str("\n "), - 7 => stderr.write_str(" "), + 15 => stderr.write(bytes!("\n ")), + 7 => stderr.write(bytes!(" ")), _ => () } stderr.flush(); } - stderr.write_char('\n'); + stderr.write(bytes!("\n")); } pub fn hexdump(obj: &T) { diff --git a/src/components/util/util.rc b/src/components/util/util.rc index d530652f591..fd2110c839e 100644 --- a/src/components/util/util.rc +++ b/src/components/util/util.rc @@ -8,7 +8,7 @@ url = "http://servo.org/")]; #[crate_type = "lib"]; -#[feature(macro_rules)]; +#[feature(macro_rules, managed_boxes)]; extern mod extra; extern mod geom; diff --git a/src/test/harness/contenttest/contenttest.rs b/src/test/harness/contenttest/contenttest.rs index 81c12b3a06e..f9b17badd2a 100644 --- a/src/test/harness/contenttest/contenttest.rs +++ b/src/test/harness/contenttest/contenttest.rs @@ -12,7 +12,7 @@ extern mod extra; use extra::test::{TestOpts, run_tests_console, TestDesc, TestDescAndFn, DynTestFn, DynTestName}; use extra::getopts::{getopts, reqopt}; -use std::{os, run, io, str}; +use std::{os, run, str}; use std::cell::Cell; use std::os::list_dir_path; @@ -89,7 +89,7 @@ fn run_test(file: ~str) { let infile = ~"file://" + path.display().to_str(); let res = run::process_output("./servo", [~"-z", infile]); let out = str::from_utf8(res.output); - io::print(out); + print(out); let lines: ~[&str] = out.split_iter('\n').collect(); for &line in lines.iter() { if line.contains("TEST-UNEXPECTED-FAIL") {