diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-14 05:13:17 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-14 05:13:17 -0800 |
commit | 65b891c23fbb85c32ae07e2c5495b82b29b3331a (patch) | |
tree | a5da382e3336f9b8d5f95752ebc3a4db1524fa47 | |
parent | a2391162a12c5cfa00872ead33a1551d82c46594 (diff) | |
parent | 33ac29e830639030939193098db289202adb47b0 (diff) | |
download | servo-65b891c23fbb85c32ae07e2c5495b82b29b3331a.tar.gz servo-65b891c23fbb85c32ae07e2c5495b82b29b3331a.zip |
Auto merge of #14582 - heycam:cfg, r=emilio
fix feature check for Gecko-specific assertions
r? @emilio
<!-- 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/14582)
<!-- Reviewable:end -->
-rw-r--r-- | components/style/dom.rs | 2 | ||||
-rw-r--r-- | components/style/matching.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/style/dom.rs b/components/style/dom.rs index 5017c1fd24e..a5c308cfa9a 100644 --- a/components/style/dom.rs +++ b/components/style/dom.rs @@ -250,7 +250,7 @@ pub trait TElement : PartialEq + Debug + Sized + Copy + Clone + ElementExt + Pre let data = self.borrow_data().unwrap(); // See the comment on `cascade_node` about getting the up-to-date parent // style for why we allow this on Gecko. - debug_assert!(cfg!(gecko) || data.has_current_styles()); + debug_assert!(cfg!(feature = "gecko") || data.has_current_styles()); data.styles().is_display_none() } diff --git a/components/style/matching.rs b/components/style/matching.rs index 4ea43a1c461..fc79e075421 100644 --- a/components/style/matching.rs +++ b/components/style/matching.rs @@ -739,7 +739,7 @@ pub trait MatchMethods : TElement { // some small piece of newly-added content in order to do something // specific with that frame, but not wanting to flush all of // layout). - debug_assert!(cfg!(gecko) || d.has_current_styles()); + debug_assert!(cfg!(feature = "gecko") || d.has_current_styles()); &d.styles().primary.values }); |