mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Run rustfmt on selectors, servo_arc, and style.
This was generated with: ./mach cargo fmt --package selectors && ./mach cargo fmt --package servo_arc && ./mach cargo fmt --package style Using rustfmt 0.4.1-nightly (a4462d1 2018-03-26)
This commit is contained in:
parent
f7ae1a37e3
commit
c99bcdd4b8
181 changed files with 9981 additions and 7933 deletions
|
@ -14,7 +14,7 @@ use gecko_bindings::structs::{nsAtom, nsAtom_AtomKind, nsDynamicAtom, nsStaticAt
|
|||
use nsstring::{nsAString, nsStr};
|
||||
use precomputed_hash::PrecomputedHash;
|
||||
use std::{mem, slice, str};
|
||||
use std::borrow::{Cow, Borrow};
|
||||
use std::borrow::{Borrow, Cow};
|
||||
use std::char::{self, DecodeUtf16};
|
||||
use std::fmt::{self, Write};
|
||||
use std::hash::{Hash, Hasher};
|
||||
|
@ -33,7 +33,9 @@ pub mod namespace;
|
|||
pub use self::namespace::{Namespace, WeakNamespace};
|
||||
|
||||
macro_rules! local_name {
|
||||
($s: tt) => { atom!($s) }
|
||||
($s:tt) => {
|
||||
atom!($s)
|
||||
};
|
||||
}
|
||||
|
||||
/// A strong reference to a Gecko atom.
|
||||
|
@ -55,9 +57,7 @@ impl Deref for Atom {
|
|||
|
||||
#[inline]
|
||||
fn deref(&self) -> &WeakAtom {
|
||||
unsafe {
|
||||
&*self.0
|
||||
}
|
||||
unsafe { &*self.0 }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -99,9 +99,7 @@ impl WeakAtom {
|
|||
/// Clone this atom, bumping the refcount if the atom is not static.
|
||||
#[inline]
|
||||
pub fn clone(&self) -> Atom {
|
||||
unsafe {
|
||||
Atom::from_raw(self.as_ptr())
|
||||
}
|
||||
unsafe { Atom::from_raw(self.as_ptr()) }
|
||||
}
|
||||
|
||||
/// Get the atom hash.
|
||||
|
@ -114,16 +112,16 @@ impl WeakAtom {
|
|||
#[inline]
|
||||
pub fn as_slice(&self) -> &[u16] {
|
||||
let string = if self.is_static() {
|
||||
let atom_ptr = self.as_ptr() as *const nsStaticAtom;
|
||||
let string_offset = unsafe { (*atom_ptr).mStringOffset };
|
||||
let string_offset = -(string_offset as isize);
|
||||
let u8_ptr = atom_ptr as *const u8;
|
||||
// It is safe to use offset() here because both addresses are within
|
||||
// the same struct, e.g. mozilla::detail::gGkAtoms.
|
||||
unsafe { u8_ptr.offset(string_offset) as *const u16 }
|
||||
let atom_ptr = self.as_ptr() as *const nsStaticAtom;
|
||||
let string_offset = unsafe { (*atom_ptr).mStringOffset };
|
||||
let string_offset = -(string_offset as isize);
|
||||
let u8_ptr = atom_ptr as *const u8;
|
||||
// It is safe to use offset() here because both addresses are within
|
||||
// the same struct, e.g. mozilla::detail::gGkAtoms.
|
||||
unsafe { u8_ptr.offset(string_offset) as *const u16 }
|
||||
} else {
|
||||
let atom_ptr = self.as_ptr() as *const nsDynamicAtom;
|
||||
unsafe { (*(atom_ptr)).mString }
|
||||
let atom_ptr = self.as_ptr() as *const nsDynamicAtom;
|
||||
unsafe { (*(atom_ptr)).mString }
|
||||
};
|
||||
unsafe { slice::from_raw_parts(string, self.len() as usize) }
|
||||
}
|
||||
|
@ -139,7 +137,7 @@ impl WeakAtom {
|
|||
/// pretty slow.
|
||||
pub fn with_str<F, Output>(&self, cb: F) -> Output
|
||||
where
|
||||
F: FnOnce(&str) -> Output
|
||||
F: FnOnce(&str) -> Output,
|
||||
{
|
||||
let mut buffer: [u8; 64] = unsafe { mem::uninitialized() };
|
||||
|
||||
|
@ -175,17 +173,13 @@ impl WeakAtom {
|
|||
/// Returns whether this atom is static.
|
||||
#[inline]
|
||||
pub fn is_static(&self) -> bool {
|
||||
unsafe {
|
||||
(*self.as_ptr()).mKind() == nsAtom_AtomKind::Static as u32
|
||||
}
|
||||
unsafe { (*self.as_ptr()).mKind() == nsAtom_AtomKind::Static as u32 }
|
||||
}
|
||||
|
||||
/// Returns the length of the atom string.
|
||||
#[inline]
|
||||
pub fn len(&self) -> u32 {
|
||||
unsafe {
|
||||
(*self.as_ptr()).mLength()
|
||||
}
|
||||
unsafe { (*self.as_ptr()).mLength() }
|
||||
}
|
||||
|
||||
/// Returns whether this atom is the empty string.
|
||||
|
@ -204,7 +198,10 @@ impl WeakAtom {
|
|||
/// Convert this atom to ASCII lower-case
|
||||
pub fn to_ascii_lowercase(&self) -> Atom {
|
||||
let slice = self.as_slice();
|
||||
match slice.iter().position(|&char16| (b'A' as u16) <= char16 && char16 <= (b'Z' as u16)) {
|
||||
match slice
|
||||
.iter()
|
||||
.position(|&char16| (b'A' as u16) <= char16 && char16 <= (b'Z' as u16))
|
||||
{
|
||||
None => self.clone(),
|
||||
Some(i) => {
|
||||
let mut buffer: [u16; 64] = unsafe { mem::uninitialized() };
|
||||
|
@ -222,7 +219,7 @@ impl WeakAtom {
|
|||
}
|
||||
}
|
||||
Atom::from(&*mutable_slice)
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -245,8 +242,9 @@ impl WeakAtom {
|
|||
|
||||
/// Return whether this atom is an ASCII-case-insensitive match for the given string
|
||||
pub fn eq_str_ignore_ascii_case(&self, other: &str) -> bool {
|
||||
self.chars().map(|r| r.map(|c: char| c.to_ascii_lowercase()))
|
||||
.eq(other.chars().map(|c: char| Ok(c.to_ascii_lowercase())))
|
||||
self.chars()
|
||||
.map(|r| r.map(|c: char| c.to_ascii_lowercase()))
|
||||
.eq(other.chars().map(|c: char| Ok(c.to_ascii_lowercase())))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -267,7 +265,10 @@ impl fmt::Display for WeakAtom {
|
|||
|
||||
impl Atom {
|
||||
/// Execute a callback with the atom represented by `ptr`.
|
||||
pub unsafe fn with<F, R>(ptr: *mut nsAtom, callback: F) -> R where F: FnOnce(&Atom) -> R {
|
||||
pub unsafe fn with<F, R>(ptr: *mut nsAtom, callback: F) -> R
|
||||
where
|
||||
F: FnOnce(&Atom) -> R,
|
||||
{
|
||||
let atom = Atom(WeakAtom::new(ptr));
|
||||
let ret = callback(&atom);
|
||||
mem::forget(atom);
|
||||
|
@ -283,8 +284,10 @@ impl Atom {
|
|||
#[inline]
|
||||
pub unsafe fn from_static(ptr: *mut nsStaticAtom) -> Self {
|
||||
let atom = Atom(ptr as *mut WeakAtom);
|
||||
debug_assert!(atom.is_static(),
|
||||
"Called from_static for a non-static atom!");
|
||||
debug_assert!(
|
||||
atom.is_static(),
|
||||
"Called from_static for a non-static atom!"
|
||||
);
|
||||
atom
|
||||
}
|
||||
|
||||
|
@ -316,13 +319,19 @@ impl Atom {
|
|||
}
|
||||
|
||||
impl Hash for Atom {
|
||||
fn hash<H>(&self, state: &mut H) where H: Hasher {
|
||||
fn hash<H>(&self, state: &mut H)
|
||||
where
|
||||
H: Hasher,
|
||||
{
|
||||
state.write_u32(self.get_hash());
|
||||
}
|
||||
}
|
||||
|
||||
impl Hash for WeakAtom {
|
||||
fn hash<H>(&self, state: &mut H) where H: Hasher {
|
||||
fn hash<H>(&self, state: &mut H)
|
||||
where
|
||||
H: Hasher,
|
||||
{
|
||||
state.write_u32(self.get_hash());
|
||||
}
|
||||
}
|
||||
|
@ -330,9 +339,7 @@ impl Hash for WeakAtom {
|
|||
impl Clone for Atom {
|
||||
#[inline(always)]
|
||||
fn clone(&self) -> Atom {
|
||||
unsafe {
|
||||
Atom::from_raw(self.as_ptr())
|
||||
}
|
||||
unsafe { Atom::from_raw(self.as_ptr()) }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -362,9 +369,7 @@ impl fmt::Debug for Atom {
|
|||
|
||||
impl fmt::Display for Atom {
|
||||
fn fmt(&self, w: &mut fmt::Formatter) -> fmt::Result {
|
||||
unsafe {
|
||||
(&*self.0).fmt(w)
|
||||
}
|
||||
unsafe { (&*self.0).fmt(w) }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -373,9 +378,10 @@ impl<'a> From<&'a str> for Atom {
|
|||
fn from(string: &str) -> Atom {
|
||||
debug_assert!(string.len() <= u32::max_value() as usize);
|
||||
unsafe {
|
||||
Atom(WeakAtom::new(
|
||||
Gecko_Atomize(string.as_ptr() as *const _, string.len() as u32)
|
||||
))
|
||||
Atom(WeakAtom::new(Gecko_Atomize(
|
||||
string.as_ptr() as *const _,
|
||||
string.len() as u32,
|
||||
)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -390,11 +396,7 @@ impl<'a> From<&'a [u16]> for Atom {
|
|||
impl<'a> From<&'a nsAString> for Atom {
|
||||
#[inline]
|
||||
fn from(string: &nsAString) -> Atom {
|
||||
unsafe {
|
||||
Atom(WeakAtom::new(
|
||||
Gecko_Atomize16(string)
|
||||
))
|
||||
}
|
||||
unsafe { Atom(WeakAtom::new(Gecko_Atomize16(string))) }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue