Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Manually format remaining problems

Browse source 
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.
This commit is contained in:
Pyfisch 2018-11-06 16:08:50 +01:00
parent cb07debcb6
commit 095d446ccd
5 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/gfx/text/glyph.rs
View file

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

27
components/script/dom/bindings/utils.rs
View file

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

9
components/script/dom/url.rs
View file

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

25
tests/unit/malloc_size_of/lib.rs
View file

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

23
tests/unit/script_plugins/lib.rs
View file

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