Auto merge of #18809 - Eijebong:bitflags, r=nox

Update bitflags to 1.0 in every servo crate

It still needs dependencies update to remove all the other bitflags
versions.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because it's a dependency update

<!-- 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/18809)
<!-- Reviewable:end -->

1 files changed, 13 insertions, 14 deletions

diff --git a/components/layout/text.rs b/components/layout/text.rs
index bdee1c52980..6da6d094998 100644
--- a/components/layout/text.rs
+++ b/components/layout/text.rs
@@ -7,15 +7,14 @@
 #![deny(unsafe_code)]
 
 use app_units::Au;
-use fragment::{Fragment, REQUIRES_LINE_BREAK_AFTERWARD_IF_WRAPPING_ON_NEWLINES, ScannedTextFlags};
-use fragment::{SELECTED, ScannedTextFragmentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo};
-use gfx::font::{DISABLE_KERNING_SHAPING_FLAG, FontMetrics, IGNORE_LIGATURES_SHAPING_FLAG};
-use gfx::font::{KEEP_ALL_FLAG, RTL_FLAG, RunMetrics, ShapingFlags, ShapingOptions};
+use fragment::{Fragment, ScannedTextFlags};
+use fragment::{ScannedTextFragmentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo};
+use gfx::font::{FontMetrics, RunMetrics, ShapingFlags, ShapingOptions};
 use gfx::font_context::FontContext;
 use gfx::text::glyph::ByteIndex;
 use gfx::text::text_run::TextRun;
 use gfx::text::util::{self, CompressionMode};
-use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFragments, LAST_FRAGMENT_OF_ELEMENT};
+use inline::{InlineFragmentNodeFlags, InlineFragments};
 use linked_list::split_off_head;
 use ordered_float::NotNaN;
 use range::Range;
@@ -291,15 +290,15 @@ impl TextRunScanner {
             let mut flags = ShapingFlags::empty();
             if let Some(v) = letter_spacing.value() {
                 if v.px() != 0. {
-                    flags.insert(IGNORE_LIGATURES_SHAPING_FLAG);
+                    flags.insert(ShapingFlags::IGNORE_LIGATURES_SHAPING_FLAG);
                 }
             }
             if text_rendering == text_rendering::T::optimizespeed {
-                flags.insert(IGNORE_LIGATURES_SHAPING_FLAG);
-                flags.insert(DISABLE_KERNING_SHAPING_FLAG)
+                flags.insert(ShapingFlags::IGNORE_LIGATURES_SHAPING_FLAG);
+                flags.insert(ShapingFlags::DISABLE_KERNING_SHAPING_FLAG)
             }
             if word_break == word_break::T::keep_all {
-                flags.insert(KEEP_ALL_FLAG);
+                flags.insert(ShapingFlags::KEEP_ALL_FLAG);
             }
             let options = ShapingOptions {
                 letter_spacing: letter_spacing.value().cloned().map(Au::from),
@@ -313,7 +312,7 @@ impl TextRunScanner {
                 let mut options = options;
                 options.script = run_info.script;
                 if run_info.bidi_level.is_rtl() {
-                    options.flags.insert(RTL_FLAG);
+                    options.flags.insert(ShapingFlags::RTL_FLAG);
                 }
                 let mut font = fontgroup.fonts.get(run_info.font_index).unwrap().borrow_mut();
                 ScannedTextRun {
@@ -364,11 +363,11 @@ impl TextRunScanner {
 
                 if requires_line_break_afterward_if_wrapping_on_newlines {
                     byte_range.extend_by(ByteIndex(-1)); // Trim the '\n'
-                    flags.insert(REQUIRES_LINE_BREAK_AFTERWARD_IF_WRAPPING_ON_NEWLINES);
+                    flags.insert(ScannedTextFlags::REQUIRES_LINE_BREAK_AFTERWARD_IF_WRAPPING_ON_NEWLINES);
                 }
 
                 if mapping.selected {
-                    flags.insert(SELECTED);
+                    flags.insert(ScannedTextFlags::SELECTED);
                 }
 
                 let insertion_point = if mapping.contains_insertion_point(scanned_run.insertion_point) {
@@ -402,10 +401,10 @@ impl TextRunScanner {
                 if let Some(ref mut context) = new_fragment.inline_context {
                     for node in &mut context.nodes {
                         if !is_last_mapping_of_this_old_fragment {
-                            node.flags.remove(LAST_FRAGMENT_OF_ELEMENT);
+                            node.flags.remove(InlineFragmentNodeFlags::LAST_FRAGMENT_OF_ELEMENT);
                         }
                         if !is_first_mapping_of_this_old_fragment {
-                            node.flags.remove(FIRST_FRAGMENT_OF_ELEMENT);
+                            node.flags.remove(InlineFragmentNodeFlags::FIRST_FRAGMENT_OF_ELEMENT);
                         }
                     }
                 }