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: Rename CustomPropertiesBuilder::custom_properties to something more descriptive.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-10-08 19:15:16 +02:00
parent 4914351f2b
commit 1ecd942384
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/custom_properties.rs
View file

@ -461,7 +461,7 @@ fn parse_var_function<'i, 't>(
/// properties. /// properties.
pub struct CustomPropertiesBuilder<'a> { pub struct CustomPropertiesBuilder<'a> {
seen: PrecomputedHashSet<&'a Name>, seen: PrecomputedHashSet<&'a Name>,
custom_properties: Option<OrderedMap<&'a Name, BorrowedSpecifiedValue<'a>>>, specified_custom_properties: Option<OrderedMap<&'a Name, BorrowedSpecifiedValue<'a>>>,
inherited: Option<&'a Arc<CustomPropertiesMap>>, inherited: Option<&'a Arc<CustomPropertiesMap>>,
} }
@ -470,7 +470,7 @@ impl<'a> CustomPropertiesBuilder<'a> {
pub fn new(inherited: Option<&'a Arc<CustomPropertiesMap>>) -> Self { pub fn new(inherited: Option<&'a Arc<CustomPropertiesMap>>) -> Self {
Self { Self {
seen: PrecomputedHashSet::default(), seen: PrecomputedHashSet::default(),
custom_properties: None, specified_custom_properties: None,
inherited, inherited,
} }
} }
@ -486,7 +486,7 @@ impl<'a> CustomPropertiesBuilder<'a> {
return; return;
} }
let map = match self.custom_properties { let map = match self.specified_custom_properties {
Some(ref mut map) => map, Some(ref mut map) => map,
None => { None => {
let mut map = OrderedMap::new(); let mut map = OrderedMap::new();
@ -500,8 +500,8 @@ impl<'a> CustomPropertiesBuilder<'a> {
}) })
} }
} }
self.custom_properties = Some(map); self.specified_custom_properties = Some(map);
self.custom_properties.as_mut().unwrap() self.specified_custom_properties.as_mut().unwrap()
} }
}; };
@ -532,7 +532,7 @@ impl<'a> CustomPropertiesBuilder<'a> {
/// ///
/// Otherwise, just use the inherited custom properties map. /// Otherwise, just use the inherited custom properties map.
pub fn build(mut self) -> Option<Arc<CustomPropertiesMap>> { pub fn build(mut self) -> Option<Arc<CustomPropertiesMap>> {
let mut map = match self.custom_properties.take() { let mut map = match self.specified_custom_properties.take() {
Some(map) => map, Some(map) => map,
None => return self.inherited.cloned(), None => return self.inherited.cloned(),
}; };