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

Auto merge of #19868 - CYBAI:specific-assertion, r=emilio

Browse source 
Use specific assertions

Similar to #19865
r? jdm

Note: Should I squash all the commits into one commit?

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because it should not break anything

<!-- 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/19868)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-01-25 18:06:33 -06:00 • committed by GitHub
commit c9ba16f9fb
40 changed files with 90 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/attr.rs
View file

@ -195,7 +195,7 @@ impl Attr {
ScriptThread::enqueue_callback_reaction(owner, reaction, None);
}
assert!(Some(owner) == self.owner().r());
assert_eq!(Some(owner), self.owner().r());
owner.will_mutate_attr(self);
self.swap_value(&mut value);
if self.identifier.namespace == ns!() {
@ -230,7 +230,7 @@ impl Attr {
// Already gone from the list of attributes of old owner.
assert!(old.get_attribute(&ns, &self.identifier.local_name).r() != Some(self))
}
(Some(old), Some(new)) => assert!(&*old == new),
(Some(old), Some(new)) => assert_eq!(&*old, new),
_ => {},
}
self.owner.set(owner);

8
components/script/dom/bindings/interface.rs
View file

@ -234,7 +234,7 @@ pub unsafe fn create_named_constructors(
rooted!(in(cx) let mut constructor = ptr::null_mut::<JSObject>());
for &(native, name, arity) in named_constructors {
assert!(*name.last().unwrap() == b'\0');
assert_eq!(*name.last().unwrap(), b'\0');
let fun = JS_NewFunction(cx,
Some(native),
@ -324,7 +324,7 @@ pub unsafe fn define_on_global_object(
global: HandleObject,
name: &[u8],
obj: HandleObject) {
assert!(*name.last().unwrap() == b'\0');
assert_eq!(*name.last().unwrap(), b'\0');
assert!(JS_DefineProperty1(cx,
global,
name.as_ptr() as *const libc::c_char,
@ -429,7 +429,7 @@ unsafe fn create_unscopable_object(
rval.set(JS_NewPlainObject(cx));
assert!(!rval.ptr.is_null());
for &name in names {
assert!(*name.last().unwrap() == b'\0');
assert_eq!(*name.last().unwrap(), b'\0');
assert!(JS_DefineProperty(
cx, rval.handle(), name.as_ptr() as *const libc::c_char, TrueHandleValue,
JSPROP_READONLY, None, None));
@ -437,7 +437,7 @@ unsafe fn create_unscopable_object(
}
unsafe fn define_name(cx: *mut JSContext, obj: HandleObject, name: &[u8]) {
assert!(*name.last().unwrap() == b'\0');
assert_eq!(*name.last().unwrap(), b'\0');
rooted!(in(cx) let name = JS_AtomizeAndPinString(cx, name.as_ptr() as *const libc::c_char));
assert!(!name.is_null());
assert!(JS_DefineProperty2(cx,

2
components/script/dom/bindings/refcounted.rs
View file

@ -98,7 +98,7 @@ impl TrustedPromise {
LIVE_REFERENCES.with(|ref r| {
let r = r.borrow();
let live_references = r.as_ref().unwrap();
assert!(self.owner_thread == (&*live_references) as *const _ as *const libc::c_void);
assert_eq!(self.owner_thread, (&*live_references) as *const _ as *const libc::c_void);
// Borrow-check error requires the redundant `let promise = ...; promise` here.
let promise = match live_references.promise_table.borrow_mut().entry(self.dom_object) {
Occupied(mut entry) => {

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

@ -115,7 +115,7 @@ unsafe impl Sync for DOMJSClass {}
/// Fails if `global` is not a DOM global object.
pub fn get_proto_or_iface_array(global: *mut JSObject) -> *mut ProtoOrIfaceArray {
unsafe {
assert!(((*get_object_class(global)).flags & JSCLASS_DOM_GLOBAL) != 0);
assert_ne!(((*get_object_class(global)).flags & JSCLASS_DOM_GLOBAL), 0);
JS_GetReservedSlot(global, DOM_PROTOTYPE_SLOT).to_private() as *mut ProtoOrIfaceArray
}
}

4
components/script/dom/create.rs
View file

@ -87,7 +87,7 @@ fn create_svg_element(name: QualName,
prefix: Option<Prefix>,
document: &Document)
-> DomRoot<Element> {
assert!(name.ns == ns!(svg));
assert_eq!(name.ns, ns!(svg));
macro_rules! make(
($ctor:ident) => ({
@ -119,7 +119,7 @@ fn create_html_element(name: QualName,
creator: ElementCreator,
mode: CustomElementCreationMode)
-> DomRoot<Element> {
assert!(name.ns == ns!(html));
assert_eq!(name.ns, ns!(html));
// Step 4
let definition = document.lookup_custom_element_definition(&name.ns, &name.local, is.as_ref());

4
components/script/dom/document.rs
View file

@ -1831,8 +1831,8 @@ impl Document {
return;
}
self.domcontentloaded_dispatched.set(true);
assert!(self.ReadyState() != DocumentReadyState::Complete,
"Complete before DOMContentLoaded?");
assert_ne!(self.ReadyState(), DocumentReadyState::Complete,
"Complete before DOMContentLoaded?");
update_with_current_time_ms(&self.dom_content_loaded_event_start);

2
components/script/dom/globalscope.rs
View file

@ -610,6 +610,6 @@ fn timestamp_in_ms(time: Timespec) -> u64 {
unsafe fn global_scope_from_global(global: *mut JSObject) -> DomRoot<GlobalScope> {
assert!(!global.is_null());
let clasp = get_object_class(global);
assert!(((*clasp).flags & (JSCLASS_IS_DOMJSCLASS | JSCLASS_IS_GLOBAL)) != 0);
assert_ne!(((*clasp).flags & (JSCLASS_IS_DOMJSCLASS | JSCLASS_IS_GLOBAL)), 0);
root_from_object(global).unwrap()
}

2
components/script/dom/htmlcollection.rs
View file

@ -41,7 +41,7 @@ impl OptionU32 {
}
fn some(bits: u32) -> OptionU32 {
assert!(bits != u32::max_value());
assert_ne!(bits, u32::max_value());
OptionU32 { bits: bits }
}

2
components/script/dom/servoparser/async_html.rs
View file

@ -416,7 +416,7 @@ impl Tokenizer {
control.set_form_owner_from_parser(&form);
} else {
// TODO remove this code when keygen is implemented.
assert!(node.NodeName() == "KEYGEN", "Unknown form-associatable element");
assert_eq!(node.NodeName(), "KEYGEN", "Unknown form-associatable element");
}
}
ParseOperation::Pop { node } => {

2
components/script/dom/servoparser/mod.rs
View file

@ -872,7 +872,7 @@ impl TreeSink for Sink {
control.set_form_owner_from_parser(&form);
} else {
// TODO remove this code when keygen is implemented.
assert!(node.NodeName() == "KEYGEN", "Unknown form-associatable element");
assert_eq!(node.NodeName(), "KEYGEN", "Unknown form-associatable element");
}
}

2
components/script/dom/webglshader.rs
View file

@ -224,7 +224,7 @@ impl WebGLShader {
impl Drop for WebGLShader {
fn drop(&mut self) {
assert!(self.attached_counter.get() == 0);
assert_eq!(self.attached_counter.get(), 0);
self.delete();
}
}

6
components/script/dom/windowproxy.rs
View file

@ -106,7 +106,7 @@ impl WindowProxy {
let cx = window.get_cx();
let window_jsobject = window.reflector().get_jsobject();
assert!(!window_jsobject.get().is_null());
assert!(((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL) != 0);
assert_ne!(((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL), 0);
let _ac = JSAutoCompartment::new(cx, window_jsobject.get());
// Create a new window proxy.
@ -163,7 +163,7 @@ impl WindowProxy {
let window = DissimilarOriginWindow::new(global_to_clone_from, &*window_proxy);
let window_jsobject = window.reflector().get_jsobject();
assert!(!window_jsobject.get().is_null());
assert!(((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL) != 0);
assert_ne!(((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL), 0);
let _ac = JSAutoCompartment::new(cx, window_jsobject.get());
// Create a new window proxy.
@ -230,7 +230,7 @@ impl WindowProxy {
let window_jsobject = window.reflector().get_jsobject();
let old_js_proxy = self.reflector.get_jsobject();
assert!(!window_jsobject.get().is_null());
assert!(((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL) != 0);
assert_ne!(((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL), 0);
let _ac = JSAutoCompartment::new(cx, window_jsobject.get());
// The old window proxy no longer owns this browsing context.

6
components/script/dom/xmlhttprequest.rs
View file

@ -75,7 +75,7 @@ use time;
use timers::{OneshotTimerCallback, OneshotTimerHandle};
use url::Position;
#[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq)]
#[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)]
enum XMLHttpRequestState {
Unsent = 0,
Opened = 1,
@ -849,7 +849,7 @@ pub type TrustedXHRAddress = Trusted<XMLHttpRequest>;
impl XMLHttpRequest {
fn change_ready_state(&self, rs: XMLHttpRequestState) {
assert!(self.ready_state.get() != rs);
assert_ne!(self.ready_state.get(), rs);
self.ready_state.set(rs);
let event = Event::new(&self.global(),
atom!("readystatechange"),
@ -1205,7 +1205,7 @@ impl XMLHttpRequest {
};
let last = true;
let (_, read, written, _) = decoder.decode_to_utf16(bytes, extra, last);
assert!(read == bytes.len());
assert_eq!(read, bytes.len());
unsafe {
utf16.set_len(written)
}