diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-12-05 19:35:25 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-05 19:35:25 -0600 |
commit | b24778202a4d886a990ee493adfb6851ac4be40c (patch) | |
tree | 4071fb814c411a6c2fd52192d0994bd4861af94d /components/style/logical_geometry.rs | |
parent | 1aadbd463a28275056826c27f8acc233e052adea (diff) | |
parent | af879523eabbdb72b672aab50da1f83bb782ed1e (diff) | |
download | servo-b24778202a4d886a990ee493adfb6851ac4be40c.tar.gz servo-b24778202a4d886a990ee493adfb6851ac4be40c.zip |
Auto merge of #19500 - emilio:camel-case-all-the-way, r=nox
style: Make all keywords CamelCase for consistency.
<!-- 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/19500)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/logical_geometry.rs')
-rw-r--r-- | components/style/logical_geometry.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/components/style/logical_geometry.rs b/components/style/logical_geometry.rs index 08179ee4f95..601f9a4c7bd 100644 --- a/components/style/logical_geometry.rs +++ b/components/style/logical_geometry.rs @@ -42,34 +42,34 @@ bitflags!( impl WritingMode { /// Return a WritingMode bitflags from the relevant CSS properties. pub fn new(inheritedbox_style: &style_structs::InheritedBox) -> Self { - use properties::longhands::direction::computed_value::T as direction; - use properties::longhands::writing_mode::computed_value::T as writing_mode; + use properties::longhands::direction::computed_value::T as Direction; + use properties::longhands::writing_mode::computed_value::T as SpecifiedWritingMode; let mut flags = WritingMode::empty(); match inheritedbox_style.clone_direction() { - direction::ltr => {}, - direction::rtl => { + Direction::Ltr => {}, + Direction::Rtl => { flags.insert(WritingMode::RTL); }, } match inheritedbox_style.clone_writing_mode() { - writing_mode::horizontal_tb => {}, - writing_mode::vertical_rl => { + SpecifiedWritingMode::HorizontalTb => {}, + SpecifiedWritingMode::VerticalRl => { flags.insert(WritingMode::VERTICAL); }, - writing_mode::vertical_lr => { + SpecifiedWritingMode::VerticalLr => { flags.insert(WritingMode::VERTICAL); flags.insert(WritingMode::VERTICAL_LR); }, #[cfg(feature = "gecko")] - writing_mode::sideways_rl => { + SpecifiedWritingMode::SidewaysRl => { flags.insert(WritingMode::VERTICAL); flags.insert(WritingMode::SIDEWAYS); }, #[cfg(feature = "gecko")] - writing_mode::sideways_lr => { + SpecifiedWritingMode::SidewaysLr => { flags.insert(WritingMode::VERTICAL); flags.insert(WritingMode::VERTICAL_LR); flags.insert(WritingMode::LINE_INVERTED); @@ -79,18 +79,18 @@ impl WritingMode { #[cfg(feature = "gecko")] { - use properties::longhands::text_orientation::computed_value::T as text_orientation; + use properties::longhands::text_orientation::computed_value::T as TextOrientation; // If FLAG_SIDEWAYS is already set, this means writing-mode is // either sideways-rl or sideways-lr, and for both of these values, // text-orientation has no effect. if !flags.intersects(WritingMode::SIDEWAYS) { match inheritedbox_style.clone_text_orientation() { - text_orientation::mixed => {}, - text_orientation::upright => { + TextOrientation::Mixed => {}, + TextOrientation::Upright => { flags.insert(WritingMode::UPRIGHT); }, - text_orientation::sideways => { + TextOrientation::Sideways => { flags.insert(WritingMode::SIDEWAYS); }, } |