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

style: Prefer is_null to comparison with ptr::null_mut.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-05-21 02:51:56 +02:00
parent cf6b3a0fcb
commit 50c022f91a
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/style/rule_tree/mod.rs
View file

@ -562,7 +562,7 @@ impl RuleNode {
// Store the `next` pointer as appropriate, either in the previous // Store the `next` pointer as appropriate, either in the previous
// sibling, or in the parent otherwise. // sibling, or in the parent otherwise.
if prev_sibling == ptr::null_mut() { if prev_sibling.is_null() {
let parent = self.parent.as_ref().unwrap(); let parent = self.parent.as_ref().unwrap();
parent.get().first_child.store(next_sibling, Ordering::Relaxed); parent.get().first_child.store(next_sibling, Ordering::Relaxed);
} else { } else {
@ -572,7 +572,7 @@ impl RuleNode {
// Store the previous sibling pointer in the next sibling if present, // Store the previous sibling pointer in the next sibling if present,
// otherwise we're done. // otherwise we're done.
if next_sibling != ptr::null_mut() { if !next_sibling.is_null() {
let next = &*next_sibling; let next = &*next_sibling;
next.prev_sibling.store(prev_sibling, Ordering::Relaxed); next.prev_sibling.store(prev_sibling, Ordering::Relaxed);
} }
@ -713,7 +713,7 @@ impl StrongRuleNode {
new_ptr, new_ptr,
Ordering::AcqRel); Ordering::AcqRel);
if existing == ptr::null_mut() { if existing.is_null() {
// Now we know we're in the correct position in the child // Now we know we're in the correct position in the child
// list, we can set the back pointer, knowing that this will // list, we can set the back pointer, knowing that this will
// only be accessed again in a single-threaded manner when // only be accessed again in a single-threaded manner when
@ -725,7 +725,8 @@ impl StrongRuleNode {
return StrongRuleNode::new(node); return StrongRuleNode::new(node);
} }
// Existing is not null: some thread insert a child node since we accessed `last`. // Existing is not null: some thread inserted a child node since
// we accessed `last`.
strong = WeakRuleNode { ptr: existing }.upgrade(); strong = WeakRuleNode { ptr: existing }.upgrade();
if strong.get().source.as_ref().unwrap().ptr_equals(&source) { if strong.get().source.as_ref().unwrap().ptr_equals(&source) {
@ -1206,7 +1207,7 @@ impl Drop for StrongRuleNode {
Ordering::Acquire, Ordering::Acquire,
Ordering::Relaxed) { Ordering::Relaxed) {
Ok(..) => { Ok(..) => {
if old_head != ptr::null_mut() { if !old_head.is_null() {
break; break;
} }
}, },