cargo fix --edition-idioms

components/net_traits/Cargo.toml

@@ -1,3 +1,5 @@
+cargo-features = ["rename-dependency"]
+
 [package]
 name = "net_traits"
 version = "0.0.1"
@@ -20,7 +22,7 @@ headers-ext = "0.0.3"
 http = "0.1"
 hyper = "0.12"
 hyper_serde = "0.9"
-image = "0.19"
+piston_image = {package = "image", version = "0.19"}
 ipc-channel = "0.11"
 lazy_static = "1"
 log = "0.4"

components/net_traits/image/base.rs

@@ -2,8 +2,8 @@
  * 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 crate::piston_image::{self, DynamicImage, ImageFormat};
 use ipc_channel::ipc::IpcSharedMemory;
+use piston_image::{DynamicImage, ImageFormat};
 use pixels;
 use std::fmt;
 use webrender_api;

components/net_traits/lib.rs

@@ -4,15 +4,6 @@
 
 #![deny(unsafe_code)]
 
-extern crate cookie as cookie_rs;
-extern crate embedder_traits;
-extern crate headers_core;
-extern crate headers_ext;
-extern crate http;
-extern crate hyper;
-extern crate hyper_serde;
-extern crate image as piston_image;
-extern crate ipc_channel;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
@@ -21,20 +12,12 @@ extern crate log;
 extern crate malloc_size_of;
 #[macro_use]
 extern crate malloc_size_of_derive;
-extern crate mime;
-extern crate msg;
-extern crate num_traits;
-extern crate pixels;
 #[macro_use]
 extern crate serde;
-extern crate servo_arc;
-extern crate servo_url;
 #[macro_use]
 extern crate url;
-extern crate uuid;
-extern crate webrender_api;
 
-use crate::cookie_rs::Cookie;
+use cookie::Cookie;
 use crate::filemanager_thread::FileManagerThreadMsg;
 use crate::request::{Request, RequestInit};
 use crate::response::{HttpsState, Response, ResponseInit};

components/net_traits/tests/image.rs

@@ -2,8 +2,6 @@
  * 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/. */
 
-extern crate net_traits;
-
 use net_traits::image::base::detect_image_format;
 
 #[test]

components/net_traits/tests/pub_domains.rs

@@ -2,8 +2,6 @@
  * 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/. */
 
-extern crate net_traits;
-
 use net_traits::pub_domains::{is_pub_domain, is_reg_domain, pub_suffix, reg_suffix};
 
 // These tests may need to be updated if the PSL changes.

components/net_traits/tests/whitespace.rs

@@ -2,7 +2,7 @@
  * 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/. */
 
-extern crate net_traits;
+use net_traits;
 
 #[test]
 fn test_trim_http_whitespace() {