From b31da68ef2031f15d719dec3aede69053267e7e7 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 10 Aug 2012 18:29:27 -0700 Subject: [PATCH] Eliminate warnings --- src/servo/layout/layout_task.rs | 2 +- src/servo/layout/traverse.rs | 2 +- src/servo/resource/file_loader.rs | 2 +- src/servo/resource/http_loader.rs | 2 +- src/servo/resource/image_cache_task.rs | 55 +++++++++++++------------- src/servo/resource/resource_task.rs | 8 ++-- src/servo/text/font.rs | 2 +- 7 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/servo/layout/layout_task.rs b/src/servo/layout/layout_task.rs index d44797190b1..28c7de42c71 100644 --- a/src/servo/layout/layout_task.rs +++ b/src/servo/layout/layout_task.rs @@ -22,7 +22,7 @@ enum Msg { ExitMsg } -fn Layout(renderer: Renderer, image_cache_task: ImageCacheTask) -> Layout { +fn Layout(renderer: Renderer, _image_cache_task: ImageCacheTask) -> Layout { do spawn_listener::|request| { loop { match request.recv() { diff --git a/src/servo/layout/traverse.rs b/src/servo/layout/traverse.rs index 13339fc7b14..ae7e7a92864 100644 --- a/src/servo/layout/traverse.rs +++ b/src/servo/layout/traverse.rs @@ -76,7 +76,7 @@ fn traverse_helper(-root : @Box, returned : T, -top_down : fn~(+T // task boundary without copying it let swappable : ~mut option<*shared_box> = ~mut some(unwrapped); - do task::spawn || { + do task::spawn |copy top_down, copy bottom_up| { // Get the box out of the option and into the new task let mut swapped_in = none; swapped_in <-> *swappable; diff --git a/src/servo/resource/file_loader.rs b/src/servo/resource/file_loader.rs index 963abcf0a6a..f6e87dc902c 100644 --- a/src/servo/resource/file_loader.rs +++ b/src/servo/resource/file_loader.rs @@ -9,7 +9,7 @@ import result::{result, ok, err}; const READ_SIZE: uint = 1024; -fn factory(url: url, progress_chan: chan) { +fn factory(+url: url, progress_chan: chan) { assert url.scheme == ~"file"; do spawn { diff --git a/src/servo/resource/http_loader.rs b/src/servo/resource/http_loader.rs index 9987a178d81..8713e7c20c2 100644 --- a/src/servo/resource/http_loader.rs +++ b/src/servo/resource/http_loader.rs @@ -7,7 +7,7 @@ import std::net::url::url; import http_client::{uv_http_request}; import result::{ok, err}; -fn factory(url: url, progress_chan: chan) { +fn factory(+url: url, progress_chan: chan) { assert url.scheme == ~"http"; do spawn { diff --git a/src/servo/resource/image_cache_task.rs b/src/servo/resource/image_cache_task.rs index 49a8891e7dd..0e03af4ba31 100644 --- a/src/servo/resource/image_cache_task.rs +++ b/src/servo/resource/image_cache_task.rs @@ -66,6 +66,7 @@ struct FutureData { mut waiters: ~[chan]; } +#[allow(non_implicitly_copyable_typarams)] impl ImageCache { fn run() { @@ -81,34 +82,34 @@ impl ImageCache { } /*priv*/ fn prefetch(url: url) { - if self.image_map.contains_key(url) { + if self.image_map.contains_key(copy url) { // We've already decoded this image return } - if self.future_image_map.contains_key(url) { + if self.future_image_map.contains_key(copy url) { // We've already begun decoding this image return } - if self.prefetch_map.contains_key(url) { + if self.prefetch_map.contains_key(copy url) { // We're already waiting for this image return } let response_port = port(); - self.resource_task.send(resource_task::Load(url, response_port.chan())); + self.resource_task.send(resource_task::Load(copy url, response_port.chan())); let prefetch_data = @PrefetchData { response_port: response_port, data: ~[] }; - self.prefetch_map.insert(url, prefetch_data); + self.prefetch_map.insert(copy url, prefetch_data); } /*priv*/ fn get_image(url: url, response: chan) { - match self.image_map.find(url) { + match self.image_map.find(copy url) { some(image) => { response.send(ImageReady(clone_arc(image))); return @@ -116,7 +117,7 @@ impl ImageCache { none => () } - match self.future_image_map.find(url) { + match self.future_image_map.find(copy url) { some(future_data) => { // We've started decoding this image but haven't recieved it back yet. // Put this client on the wait list @@ -126,7 +127,7 @@ impl ImageCache { none => () } - match self.prefetch_map.find(url) { + match self.prefetch_map.find(copy url) { some(prefetch_data) => { let mut image_sent = false; @@ -144,26 +145,26 @@ impl ImageCache { let to_cache = self.from_client.chan(); - do spawn { + do spawn |copy url| { let image = arc(~load_from_memory(data)); // Send the image to the original requester response.send(ImageReady(clone_arc(&image))); - to_cache.send(StoreImage(url, clone_arc(&image))); + to_cache.send(StoreImage(copy url, clone_arc(&image))); } let future_data = @FutureData { waiters: ~[] }; - self.prefetch_map.remove(url); - self.future_image_map.insert(url, future_data); + self.prefetch_map.remove(copy url); + self.future_image_map.insert(copy url, future_data); image_sent = true; break; } resource_task::Done(result::err(*)) => { // FIXME: need to actually report the failed image load - self.prefetch_map.remove(url); + self.prefetch_map.remove(copy url); break; } } @@ -178,7 +179,7 @@ impl ImageCache { } /*priv*/ fn store_image(url: url, image: &arc<~Image>) { - match self.future_image_map.find(url) { + match self.future_image_map.find(copy url) { some(future_data) => { let mut waiters = ~[]; @@ -189,8 +190,8 @@ impl ImageCache { for waiters.each |waiter| { waiter.send(ImageReady(clone_arc(image))) } - self.image_map.insert(url, @clone_arc(image)); - self.future_image_map.remove(url); + self.image_map.insert(copy url, @clone_arc(image)); + self.future_image_map.remove(copy url); } none => fail ~"storing an image that isn't in the future map" } @@ -214,7 +215,7 @@ fn should_exit_on_request() { }; let image_cache_task = image_cache_task(mock_resource_task); - let url = make_url(~"file", none); + let _url = make_url(~"file", none); image_cache_task.send(Exit); mock_resource_task.send(resource_task::Exit); @@ -224,7 +225,7 @@ fn should_exit_on_request() { #[should_fail] fn should_fail_if_unprefetched_image_is_requested() { - let mock_resource_task = do spawn_listener |from_client| { + let mock_resource_task = do spawn_listener |_from_client| { }; let image_cache_task = image_cache_task(mock_resource_task); @@ -283,7 +284,7 @@ fn should_not_request_url_from_resource_task_on_multiple_prefetches() { let image_cache_task = image_cache_task(mock_resource_task); let url = make_url(~"file", none); - image_cache_task.send(Prefetch(url)); + image_cache_task.send(Prefetch(copy url)); image_cache_task.send(Prefetch(url)); url_requested.recv(); image_cache_task.send(Exit); @@ -309,7 +310,7 @@ fn should_return_image_not_ready_if_data_has_not_arrived() { let image_cache_task = image_cache_task(mock_resource_task); let url = make_url(~"file", none); - image_cache_task.send(Prefetch(url)); + image_cache_task.send(Prefetch(copy url)); let response_port = port(); image_cache_task.send(GetImage(url, response_port.chan())); assert response_port.recv() == ImageNotReady; @@ -343,7 +344,7 @@ fn should_return_decoded_image_data_if_data_has_arrived() { let image_cache_task = image_cache_task(mock_resource_task); let url = make_url(~"file", none); - image_cache_task.send(Prefetch(url)); + image_cache_task.send(Prefetch(copy url)); // Wait until our mock resource task has sent the image to the image cache image_bin_sent.recv(); @@ -385,14 +386,14 @@ fn should_return_decoded_image_data_for_multiple_requests() { let image_cache_task = image_cache_task(mock_resource_task); let url = make_url(~"file", none); - image_cache_task.send(Prefetch(url)); + image_cache_task.send(Prefetch(copy url)); // Wait until our mock resource task has sent the image to the image cache image_bin_sent.recv(); for iter::repeat(2) { let response_port = port(); - image_cache_task.send(GetImage(url, response_port.chan())); + image_cache_task.send(GetImage(copy url, response_port.chan())); match response_port.recv() { ImageReady(_) => (), _ => fail @@ -435,19 +436,19 @@ fn should_not_request_image_from_resource_task_if_image_is_already_available() { let image_cache_task = image_cache_task(mock_resource_task); let url = make_url(~"file", none); - image_cache_task.send(Prefetch(url)); + image_cache_task.send(Prefetch(copy url)); // Wait until our mock resource task has sent the image to the image cache image_bin_sent.recv(); let response_port = port(); - image_cache_task.send(GetImage(url, response_port.chan())); + image_cache_task.send(GetImage(copy url, response_port.chan())); match response_port.recv() { ImageReady(_) => (), _ => fail } - image_cache_task.send(Prefetch(url)); + image_cache_task.send(Prefetch(copy url)); let response_port = port(); image_cache_task.send(GetImage(url, response_port.chan())); @@ -490,7 +491,7 @@ fn should_return_not_ready_if_image_bin_cannot_be_fetched() { let image_cache_task = image_cache_task(mock_resource_task); let url = make_url(~"file", none); - image_cache_task.send(Prefetch(url)); + image_cache_task.send(Prefetch(copy url)); // Wait until our mock resource task has sent the image to the image cache image_bin_sent.recv(); diff --git a/src/servo/resource/resource_task.rs b/src/servo/resource/resource_task.rs index db39d2320fa..c7a83d3a8f3 100644 --- a/src/servo/resource/resource_task.rs +++ b/src/servo/resource/resource_task.rs @@ -37,7 +37,7 @@ Creates a task to load a specific resource The ResourceManager delegates loading to a different type of loader task for each URL scheme */ -type LoaderTaskFactory = fn~(url: url, chan); +type LoaderTaskFactory = fn~(+url: url, chan); /// Create a ResourceTask with the default loaders fn ResourceTask() -> ResourceTask { @@ -69,7 +69,7 @@ class ResourceManager { loop { match self.from_client.recv() { Load(url, progress_chan) => { - self.load(url, progress_chan) + self.load(copy url, progress_chan) } Exit => { break @@ -78,7 +78,7 @@ class ResourceManager { } } - fn load(url: url, progress_chan: chan) { + fn load(+url: url, progress_chan: chan) { match self.get_loader_factory(url) { some(loader_factory) => { @@ -125,7 +125,7 @@ fn test_bad_scheme() { #[allow(non_implicitly_copyable_typarams)] fn should_delegate_to_scheme_loader() { let payload = ~[1, 2, 3]; - let loader_factory = fn~(_url: url, progress_chan: chan) { + let loader_factory = fn~(+_url: url, progress_chan: chan, copy payload) { progress_chan.send(Payload(copy payload)); progress_chan.send(Done(ok(()))); }; diff --git a/src/servo/text/font.rs b/src/servo/text/font.rs index fe5624a39fe..2317e914ded 100644 --- a/src/servo/text/font.rs +++ b/src/servo/text/font.rs @@ -73,7 +73,7 @@ fn should_be_able_to_create_instances_in_multiple_threads() { for iter::repeat(10u) { do task::spawn { let lib = FontLibrary(); - let font = lib.get_test_font(); + let _font = lib.get_test_font(); } } }