aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-06-11 10:31:00 -0700
committerGitHub <noreply@github.com>2017-06-11 10:31:00 -0700
commit03074f4b0e9908d80558efe519301f39aadc436e (patch)
tree54c1ddd7b69d066f31cfac7125fbd9434e01ed95
parent197afeee2d7ac54f330408708673805095a1399a (diff)
parentcb04ef933be18e4f5cd7c4b3b36211febd876333 (diff)
downloadservo-03074f4b0e9908d80558efe519301f39aadc436e.tar.gz
servo-03074f4b0e9908d80558efe519301f39aadc436e.zip
Auto merge of #17270 - emilio:bindgen-does-bitfields-sort-of, r=wafflespeanut
stylo: Use bitfield accessors in string-cache. <!-- 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/17270) <!-- Reviewable:end -->
-rw-r--r--components/style/gecko_string_cache/mod.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/components/style/gecko_string_cache/mod.rs b/components/style/gecko_string_cache/mod.rs
index 4973428f1e8..79c4ef02138 100644
--- a/components/style/gecko_string_cache/mod.rs
+++ b/components/style/gecko_string_cache/mod.rs
@@ -148,11 +148,8 @@ impl WeakAtom {
/// Returns whether this atom is static.
#[inline]
pub fn is_static(&self) -> bool {
- // FIXME(emilio): re-introduce bitfield accessors:
- //
- // https://github.com/servo/rust-bindgen/issues/519
unsafe {
- ((*self.as_ptr())._bitfield_1 & (0x80000000 as u32)) != 0
+ (*self.as_ptr()).mIsStatic() != 0
}
}