Skip to content

Commit 03fbea4

Browse files
author
bors-servo
authored
Auto merge of #16972 - emilio:sanity-is-important-most-of-the-time, r=bholley
style: Move all the style sharing code outside matching.rs This is just a code health change. I want to move it away to keep matching.rs as simple as possible. <!-- 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/16972) <!-- Reviewable:end -->
2 parents dbd4adf + 311c403 commit 03fbea4

File tree

6 files changed

+585
-499
lines changed

6 files changed

+585
-499
lines changed

components/style/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ use euclid::Size2D;
1717
use fnv::FnvHashMap;
1818
use font_metrics::FontMetricsProvider;
1919
#[cfg(feature = "gecko")] use gecko_bindings::structs;
20-
use matching::StyleSharingCandidateCache;
2120
#[cfg(feature = "servo")] use parking_lot::RwLock;
2221
#[cfg(feature = "gecko")] use properties::ComputedValues;
2322
use selector_parser::SnapshotMap;
2423
use selectors::matching::ElementSelectorFlags;
2524
#[cfg(feature = "servo")] use servo_config::opts;
2625
use shared_lock::StylesheetGuards;
26+
use sharing::StyleSharingCandidateCache;
2727
#[cfg(feature = "servo")] use std::collections::HashMap;
2828
#[cfg(feature = "gecko")] use std::env;
2929
use std::fmt;

components/style/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ pub mod rule_tree;
121121
pub mod scoped_tls;
122122
pub mod selector_parser;
123123
pub mod shared_lock;
124+
pub mod sharing;
124125
pub mod stylist;
125126
#[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod servo;
126127
pub mod sequential;

0 commit comments

Comments
 (0)