Upgrade to rustc 1.33.0-nightly (fb86d604b 2018-12-27)

components/bluetooth/lib.rs

@@ -461,10 +461,8 @@ impl BluetoothManager {
         };
 
         services.retain(|s| {
-            !uuid_is_blocklisted(&s.get_uuid().unwrap_or(String::new()), Blocklist::All) && self
-                .allowed_services
-                .get(device_id)
-                .map_or(false, |uuids| {
+            !uuid_is_blocklisted(&s.get_uuid().unwrap_or(String::new()), Blocklist::All) &&
+                self.allowed_services.get(device_id).map_or(false, |uuids| {
                     uuids.contains(&s.get_uuid().unwrap_or(String::new()))
                 })
         });
@@ -554,9 +552,9 @@ impl BluetoothManager {
     }
 
     fn characteristic_is_cached(&self, characteristic_id: &str) -> bool {
-        self.cached_characteristics.contains_key(characteristic_id) && self
-            .characteristic_to_service
-            .contains_key(characteristic_id)
+        self.cached_characteristics.contains_key(characteristic_id) &&
+            self.characteristic_to_service
+                .contains_key(characteristic_id)
     }
 
     // Descriptor

components/canvas/canvas_paint_thread.rs

@@ -2,9 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use crate::canvas_data::*;
 use azure::azure_hl::AntialiasMode;
 use canvas_traits::canvas::*;
-use crate::canvas_data::*;
 use euclid::Size2D;
 use ipc_channel::ipc::{self, IpcSender};
 use std::borrow::ToOwned;

components/canvas/webgl_mode/inprocess.rs

@@ -2,12 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use crate::gl_context::GLContextFactory;
+use crate::webgl_thread::{WebGLExternalImageApi, WebGLExternalImageHandler, WebGLThread};
 use canvas_traits::webgl::webgl_channel;
 use canvas_traits::webgl::DOMToTextureCommand;
 use canvas_traits::webgl::{WebGLChan, WebGLContextId, WebGLMsg, WebGLPipeline, WebGLReceiver};
 use canvas_traits::webgl::{WebGLSender, WebVRCommand, WebVRRenderHandler};
-use crate::gl_context::GLContextFactory;
-use crate::webgl_thread::{WebGLExternalImageApi, WebGLExternalImageHandler, WebGLThread};
 use euclid::Size2D;
 use fnv::FnvHashMap;
 use gleam::gl;

components/canvas/webgl_thread.rs

@@ -1425,10 +1425,10 @@ impl WebGLImpl {
             (depth, gl::DEPTH_BUFFER_BIT),
             (stencil, gl::STENCIL_BUFFER_BIT),
         ]
-            .iter()
-            .fold(0, |bits, &(enabled, bit)| {
-                bits | if enabled { bit } else { 0 }
-            });
+        .iter()
+        .fold(0, |bits, &(enabled, bit)| {
+            bits | if enabled { bit } else { 0 }
+        });
 
         if state.scissor_test_enabled {
             gl.disable(gl::SCISSOR_TEST);

components/config/opts.rs

@@ -975,15 +975,17 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
         })
         .collect();
 
-    let do_not_use_native_titlebar = opt_match.opt_present("b") || !PREFS
-        .get("shell.native-titlebar.enabled")
-        .as_boolean()
-        .unwrap();
-
-    let enable_subpixel_text_antialiasing = !debug_options.disable_subpixel_aa && PREFS
-        .get("gfx.subpixel-text-antialiasing.enabled")
-        .as_boolean()
-        .unwrap();
+    let do_not_use_native_titlebar = opt_match.opt_present("b") ||
+        !PREFS
+            .get("shell.native-titlebar.enabled")
+            .as_boolean()
+            .unwrap();
+
+    let enable_subpixel_text_antialiasing = !debug_options.disable_subpixel_aa &&
+        PREFS
+            .get("gfx.subpixel-text-antialiasing.enabled")
+            .as_boolean()
+            .unwrap();
 
     let is_printing_version = opt_match.opt_present("v") || opt_match.opt_present("version");