Fix obsolete format traits.

They are to be removed from the language in the next rust upgrade.

4 files changed, 10 insertions, 10 deletions

diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 7dde743a936..2c523209203 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -62,13 +62,13 @@ fn load(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) {
         match url.scheme.as_slice() {
             "http" | "https" => {}
             _ => {
-                let s = format!("{:s} request, but we don't support that scheme", url.scheme);
+                let s = format!("{} request, but we don't support that scheme", url.scheme);
                 send_error(url, s, senders);
                 return;
             }
         }
 
-        info!("requesting {:s}", url.serialize());
+        info!("requesting {}", url.serialize());
 
         let mut req = match Request::new(load_data.method.clone(), url.clone()) {
             Ok(req) => req,
diff --git a/components/net/image/holder.rs b/components/net/image/holder.rs
index 514b6c22135..2ca86d8af99 100644
--- a/components/net/image/holder.rs
+++ b/components/net/image/holder.rs
@@ -87,8 +87,8 @@ impl<NodeAddress: Send> ImageHolder<NodeAddress> {
             };
             match port.recv() {
                 ImageResponseMsg::ImageReady(image) => self.image = Some(image),
-                ImageResponseMsg::ImageNotReady => debug!("image not ready for {:s}", self.url.serialize()),
-                ImageResponseMsg::ImageFailed => debug!("image decoding failed for {:s}", self.url.serialize()),
+                ImageResponseMsg::ImageNotReady => debug!("image not ready for {}", self.url.serialize()),
+                ImageResponseMsg::ImageFailed => debug!("image decoding failed for {}", self.url.serialize()),
             }
         }
 
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs
index 0f90bc6a156..0d202a78d3e 100644
--- a/components/net/image_cache_task.rs
+++ b/components/net/image_cache_task.rs
@@ -251,11 +251,11 @@ impl ImageCache {
 
                 spawn_named("ImageCacheTask (prefetch)", proc() {
                     let url = url_clone;
-                    debug!("image_cache_task: started fetch for {:s}", url.serialize());
+                    debug!("image_cache_task: started fetch for {}", url.serialize());
 
                     let image = load_image_data(url.clone(), resource_task.clone());
                     to_cache.send(Msg::StorePrefetchedImageData(url.clone(), image));
-                    debug!("image_cache_task: ended fetch for {:s}", url.serialize());
+                    debug!("image_cache_task: ended fetch for {}", url.serialize());
                 });
 
                 self.set_state(url, ImageState::Prefetching(AfterPrefetch::DoNotDecode));
@@ -315,11 +315,11 @@ impl ImageCache {
 
                 self.task_pool.execute(proc() {
                     let url = url_clone;
-                    debug!("image_cache_task: started image decode for {:s}", url.serialize());
+                    debug!("image_cache_task: started image decode for {}", url.serialize());
                     let image = load_from_memory(data.as_slice());
                     let image = image.map(|image| Arc::new(box image));
                     to_cache.send(Msg::StoreImage(url.clone(), image));
-                    debug!("image_cache_task: ended image decode for {:s}", url.serialize());
+                    debug!("image_cache_task: ended image decode for {}", url.serialize());
                 });
 
                 self.set_state(url, ImageState::Decoding);
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index 20d40205dd2..23cb90f38be 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -234,13 +234,13 @@ impl ResourceManager {
             "data" => data_loader::factory,
             "about" => about_loader::factory,
             _ => {
-                debug!("resource_task: no loader for scheme {:s}", load_data.url.scheme);
+                debug!("resource_task: no loader for scheme {}", load_data.url.scheme);
                 start_sending(senders, Metadata::default(load_data.url))
                     .send(ProgressMsg::Done(Err("no loader for scheme".to_string())));
                 return
             }
         };
-        debug!("resource_task: loading url: {:s}", load_data.url.serialize());
+        debug!("resource_task: loading url: {}", load_data.url.serialize());
 
         loader(load_data, self.sniffer_task.clone());
     }