Manually format remaining problems

Use line comments instead of block comments
as block comments contain trailing whitespace
after formatting with rustfmt.

Skip tests for malloc_size_of and script_plugins
with rustfmt as they have many block comments.

components/gfx/text/glyph.rs

@@ -223,16 +223,15 @@ impl<'a> DetailedGlyphStore {
             entry_offset, glyphs
         );
 
-        /* TODO: don't actually assert this until asserts are compiled
-        in/out based on severity, debug/release, etc. This assertion
-        would wreck the complexity of the lookup.
-        
-        See Rust Issue #3647, #2228, #3627 for related information.
-        
-        do self.detail_lookup.borrow |arr| {
-            assert !arr.contains(entry)
-        }
-        */
+        // TODO: don't actually assert this until asserts are compiled
+        // in/out based on severity, debug/release, etc. This assertion
+        // would wreck the complexity of the lookup.
+        //
+        // See Rust Issue #3647, #2228, #3627 for related information.
+        //
+        // do self.detail_lookup.borrow |arr| {
+        //     assert !arr.contains(entry)
+        // }
 
         self.detail_lookup.push(entry);
         self.detail_buffer.extend_from_slice(glyphs);

components/script/dom/bindings/utils.rs

@@ -172,19 +172,20 @@ pub fn get_array_index_from_id(_cx: *mut JSContext, id: HandleId) -> Option<u32>
         None
     }
     // if id is length atom, -1, otherwise
-    /*return if JSID_IS_ATOM(id) {
-        let atom = JSID_TO_ATOM(id);
-        //let s = *GetAtomChars(id);
-        if s > 'a' && s < 'z' {
-            return -1;
-        }
-    
-        let i = 0;
-        let str = AtomToLinearString(JSID_TO_ATOM(id));
-        return if StringIsArray(str, &mut i) != 0 { i } else { -1 }
-    } else {
-        IdToInt32(cx, id);
-    }*/}
+    // return if JSID_IS_ATOM(id) {
+    //     let atom = JSID_TO_ATOM(id);
+    //     //let s = *GetAtomChars(id);
+    //     if s > 'a' && s < 'z' {
+    //         return -1;
+    //     }
+    //
+    //     let i = 0;
+    //     let str = AtomToLinearString(JSID_TO_ATOM(id));
+    //     return if StringIsArray(str, &mut i) != 0 { i } else { -1 }
+    // } else {
+    //     IdToInt32(cx, id);
+    // }
+}
 
 /// Find the enum equivelent of a string given by `v` in `pairs`.
 /// Returns `Err(())` on JSAPI failure (there is a pending exception), and

components/script/dom/url.rs

@@ -118,12 +118,9 @@ impl URL {
 
     // https://w3c.github.io/FileAPI/#dfn-revokeObjectURL
     pub fn RevokeObjectURL(global: &GlobalScope, url: DOMString) {
-        /*
-            If the value provided for the url argument is not a Blob URL OR
-            if the value provided for the url argument does not have an entry in the Blob URL Store,
-        
-            this method call does nothing. User agents may display a message on the error console.
-        */
+        // If the value provided for the url argument is not a Blob URL OR
+        // if the value provided for the url argument does not have an entry in the Blob URL Store,
+        // this method call does nothing. User agents may display a message on the error console.
         let origin = get_blob_origin(&global.get_url());
 
         if let Ok(url) = ServoUrl::parse(&url) {

tests/unit/malloc_size_of/lib.rs

@@ -1,6 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
+#![rustfmt::skip]
 
 /**
 ```
@@ -25,9 +26,9 @@ pub mod does_not_impl_malloc_size_of {
     ```compile_fail,E0277
     extern crate malloc_size_of;
     extern crate servo_arc;
-    
+
     fn sizeable<T: malloc_size_of::MallocSizeOf>() {}
-    
+
     fn main() {
         sizeable::<servo_arc::Arc<i32>>();
     }
@@ -38,9 +39,9 @@ pub mod does_not_impl_malloc_size_of {
     /**
     ```compile_fail,E0277
     extern crate malloc_size_of;
-    
+
     fn sizeable<T: malloc_size_of::MallocSizeOf>() {}
-    
+
     fn main() {
         sizeable::<std::sync::Arc<i32>>();
     }
@@ -51,9 +52,9 @@ pub mod does_not_impl_malloc_size_of {
     /**
     ```compile_fail,E0277
     extern crate malloc_size_of;
-    
+
     fn sizeable<T: malloc_size_of::MallocSizeOf>() {}
-    
+
     fn main() {
         sizeable::<std::rc::Rc<i32>>();
     }
@@ -67,9 +68,9 @@ pub mod does_not_impl_malloc_shallow_size_of {
     ```compile_fail,E0277
     extern crate malloc_size_of;
     extern crate servo_arc;
-    
+
     fn shallow_sizeable<T: malloc_size_of::MallocShallowSizeOf>() {}
-    
+
     fn main() {
         shallow_sizeable::<servo_arc::Arc<i32>>();
     }
@@ -80,9 +81,9 @@ pub mod does_not_impl_malloc_shallow_size_of {
     /**
     ```compile_fail,E0277
     extern crate malloc_size_of;
-    
+
     fn shallow_sizeable<T: malloc_size_of::MallocShallowSizeOf>() {}
-    
+
     fn main() {
         shallow_sizeable::<std::sync::Arc<i32>>();
     }
@@ -93,9 +94,9 @@ pub mod does_not_impl_malloc_shallow_size_of {
     /**
     ```compile_fail,E0277
     extern crate malloc_size_of;
-    
+
     fn shallow_sizeable<T: malloc_size_of::MallocShallowSizeOf>() {}
-    
+
     fn main() {
         shallow_sizeable::<std::rc::Rc<i32>>();
     }

tests/unit/script_plugins/lib.rs

@@ -1,19 +1,20 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
+#![rustfmt::skip]
 
 pub mod unrooted_must_root {
     /**
     ```
     #![feature(plugin)]
     #![plugin(script_plugins)]
-    
+
     #[must_root] struct Foo(i32);
     #[must_root] struct Bar(Foo);
-    
+
     fn foo1(_: &Foo) {}
     fn foo2(_: &()) -> &Foo { unimplemented!() }
-    
+
     fn main() {}
     ```
     */
@@ -23,10 +24,10 @@ pub mod unrooted_must_root {
     ```compile_fail
     #![feature(plugin)]
     #![plugin(script_plugins)]
-    
+
     #[must_root] struct Foo(i32);
     struct Bar(Foo);
-    
+
     fn main() {}
     ```
     */
@@ -36,11 +37,11 @@ pub mod unrooted_must_root {
     ```compile_fail
     #![feature(plugin)]
     #![plugin(script_plugins)]
-    
+
     #[must_root] struct Foo(i32);
-    
+
     fn foo1(_: Foo) {}
-    
+
     fn main() {}
     ```
     */
@@ -50,11 +51,11 @@ pub mod unrooted_must_root {
     ```compile_fail
     #![feature(plugin)]
     #![plugin(script_plugins)]
-    
+
     #[must_root] struct Foo(i32);
-    
+
     fn foo2() -> Foo { unimplemented!() }
-    
+
     fn main() {}
     ```
     */