Auto merge of #22086 - servo:2018-without-stylo, r=SimonSapin

Switch some crates to the 2018 edition

This is the subset of https://github.com/servo/servo/pull/22083 that doesn’t affect Gecko at all, so it isn’t blocked.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22086)
<!-- Reviewable:end -->

1 files changed, 9 insertions, 9 deletions

diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index d9fdebf895f..0e744e0de26 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -2,16 +2,17 @@
  * 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 blob_loader::load_blob_sync;
-use data_loader::decode;
+use crate::blob_loader::load_blob_sync;
+use crate::data_loader::decode;
+use crate::fetch::cors_cache::CorsCache;
+use crate::filemanager_thread::FileManager;
+use crate::http_loader::{HttpState, determine_request_referrer, http_fetch};
+use crate::http_loader::{set_default_accept, set_default_accept_language};
+use crate::subresource_integrity::is_response_integrity_valid;
 use devtools_traits::DevtoolsControlMsg;
-use fetch::cors_cache::CorsCache;
-use filemanager_thread::FileManager;
 use headers_core::HeaderMapExt;
 use headers_ext::{AccessControlExposeHeaders, ContentType, Range};
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
-use http_loader::{HttpState, determine_request_referrer, http_fetch};
-use http_loader::{set_default_accept, set_default_accept_language};
 use hyper::Method;
 use hyper::StatusCode;
 use ipc_channel::ipc::IpcReceiver;
@@ -32,7 +33,6 @@ use std::str;
 use std::sync::{Arc, Mutex};
 use std::sync::atomic::Ordering;
 use std::thread;
-use subresource_integrity::is_response_integrity_valid;
 
 lazy_static! {
     static ref X_CONTENT_TYPE_OPTIONS: HeaderName =
@@ -544,7 +544,7 @@ fn scheme_fetch(
                     *done_chan = Some((done_sender.clone(), done_receiver));
                     *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]);
 
-                    let mut res_body = response.body.clone();
+                    let res_body = response.body.clone();
 
                     let cancellation_listener = context.cancellation_listener.clone();
 
@@ -589,7 +589,7 @@ fn scheme_fetch(
                                     return;
                                 }
                                 let length = {
-                                    let mut buffer = reader.fill_buf().unwrap().to_vec();
+                                    let buffer = reader.fill_buf().unwrap().to_vec();
                                     let mut buffer_len = buffer.len();
                                     if let ResponseBody::Receiving(ref mut body) =
                                         *res_body.lock().unwrap()