Eliminate more warnings

This commit is contained in:
Brian Anderson 2012-10-08 18:56:49 -07:00
parent d2bc5aaf8f
commit ed4db46505
4 changed files with 13 additions and 13 deletions

View file

@ -166,7 +166,7 @@ fn build_element_kind(tag: &str) -> ~ElementKind {
}
pub fn parse_html(scope: NodeScope,
url: Url,
+url: Url,
resource_task: ResourceTask,
image_cache_task: ImageCacheTask) -> HtmlParserResult unsafe {
// Spawn a CSS parser to receive links to CSS style sheets.
@ -183,7 +183,7 @@ pub fn parse_html(scope: NodeScope,
js_script_listener(js_chan, js_port, resource_task);
};
let (scope, url) = (@copy scope, @copy url);
let (scope, url) = (@copy scope, @url);
// Build the root node.
let root = scope.new_node(Element(ElementData(~"html", ~HTMLDivElement)));

View file

@ -101,11 +101,11 @@ fn mainloop(+mode: Mode, po: comm::Port<Msg>) {
match po.recv() {
AddKeyHandler(move key_ch) => key_handlers.push(move key_ch),
AddEventListener(event_listener) => event_listeners.push(event_listener),
BeginDrawing(sender) => lend_surface(*surfaces, sender),
Draw(sender, dt) => {
BeginDrawing(move sender) => lend_surface(surfaces, sender),
Draw(move sender, move dt) => {
#debug("osmain: received new frame");
return_surface(*surfaces, dt);
lend_surface(*surfaces, sender);
return_surface(surfaces, dt);
lend_surface(surfaces, sender);
let buffer = surfaces.front.cairo_surface.data();
let image = @layers::layers::Image(800, 600, layers::layers::ARGB32Format,
@ -182,7 +182,7 @@ struct SurfaceSet {
mut back: Surface,
}
fn lend_surface(surfaces: SurfaceSet, receiver: pipes::Chan<DrawTarget>) {
fn lend_surface(surfaces: &SurfaceSet, +receiver: pipes::Chan<DrawTarget>) {
// We are in a position to lend out the surface?
assert surfaces.front.have;
// Ok then take it
@ -197,7 +197,7 @@ fn lend_surface(surfaces: SurfaceSet, receiver: pipes::Chan<DrawTarget>) {
assert surfaces.front.have;
}
fn return_surface(surfaces: SurfaceSet, draw_target: DrawTarget) {
fn return_surface(surfaces: &SurfaceSet, +draw_target: DrawTarget) {
#debug("osmain: returning surface %?", draw_target);
// We have room for a return
assert surfaces.front.have;

View file

@ -73,7 +73,7 @@ pub struct ResourceManager {
pub fn ResourceManager(from_client: Port<ControlMsg>,
loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceManager {
+loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceManager {
ResourceManager {
from_client : from_client,
loaders : loaders,
@ -97,7 +97,7 @@ impl ResourceManager {
fn load(+url: Url, progress_chan: Chan<ProgressMsg>) {
match self.get_loader_factory(url) {
match self.get_loader_factory(&url) {
Some(loader_factory) => {
#debug("resource_task: loading url: %s", to_str(copy url));
loader_factory(url, progress_chan);
@ -109,7 +109,7 @@ impl ResourceManager {
}
}
fn get_loader_factory(url: Url) -> Option<LoaderTaskFactory> {
fn get_loader_factory(url: &Url) -> Option<LoaderTaskFactory> {
for self.loaders.each |scheme_loader| {
let (scheme, loader_factory) = copy *scheme_loader;
if scheme == url.scheme {

View file

@ -120,7 +120,7 @@ impl TextRun {
}
}
fn TextRun(font: &Font, text: ~str) -> TextRun {
fn TextRun(font: &Font, +text: ~str) -> TextRun {
let glyph_store = GlyphStore(text);
let run = TextRun {
text: text,
@ -154,7 +154,7 @@ fn test_calc_min_break_width() {
#[test]
#[ignore]
fn test_iter_indivisible_pieces() {
fn test_pieces(text: ~str, res: ~[~str]) {
fn test_pieces(+text: ~str, +res: ~[~str]) {
let flib = FontCache();
let font = flib.get_test_font();
let run = TextRun(font, copy text);