Upgrade rust/crates/bstr to 0.2.16

Test: make
Change-Id: I9a9d3539c5dcba9c78484c58688281f7ffa60d9c

14 files changed, 267 insertions, 235 deletions

diff --git a/src/unicode/fsm/grapheme_break_fwd.rs b/src/unicode/fsm/grapheme_break_fwd.rs
index 317ba96..b53b1d7 100644
--- a/src/unicode/fsm/grapheme_break_fwd.rs
+++ b/src/unicode/fsm/grapheme_break_fwd.rs
@@ -2,40 +2,44 @@
 //
 //   ucd-generate dfa --name GRAPHEME_BREAK_FWD --sparse --minimize --anchored --state-size 2 src/unicode/fsm/ [snip (arg too long)]
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref GRAPHEME_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref GRAPHEME_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("grapheme_break_fwd.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("grapheme_break_fwd.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref GRAPHEME_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref GRAPHEME_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("grapheme_break_fwd.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("grapheme_break_fwd.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/fsm/grapheme_break_rev.rs b/src/unicode/fsm/grapheme_break_rev.rs
index db6b6ee..93e888c 100644
--- a/src/unicode/fsm/grapheme_break_rev.rs
+++ b/src/unicode/fsm/grapheme_break_rev.rs
@@ -2,40 +2,44 @@
 //
 //   ucd-generate dfa --name GRAPHEME_BREAK_REV --reverse --longest --sparse --minimize --anchored --state-size 2 src/unicode/fsm/ [snip (arg too long)]
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref GRAPHEME_BREAK_REV: ::regex_automata::SparseDFA<&'static [u8], u16> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref GRAPHEME_BREAK_REV: ::regex_automata::SparseDFA<&'static [u8], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("grapheme_break_rev.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("grapheme_break_rev.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref GRAPHEME_BREAK_REV: ::regex_automata::SparseDFA<&'static [u8], u16> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref GRAPHEME_BREAK_REV: ::regex_automata::SparseDFA<&'static [u8], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("grapheme_break_rev.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("grapheme_break_rev.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/fsm/regional_indicator_rev.rs b/src/unicode/fsm/regional_indicator_rev.rs
index 3b6beff..2bf7e4c 100644
--- a/src/unicode/fsm/regional_indicator_rev.rs
+++ b/src/unicode/fsm/regional_indicator_rev.rs
@@ -2,40 +2,44 @@
 //
 //   ucd-generate dfa --name REGIONAL_INDICATOR_REV --reverse --classes --minimize --anchored --premultiply --state-size 1 src/unicode/fsm/ \p{gcb=Regional_Indicator}
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref REGIONAL_INDICATOR_REV: ::regex_automata::DenseDFA<&'static [u8], u8> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref REGIONAL_INDICATOR_REV: ::regex_automata::DenseDFA<&'static [u8], u8> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("regional_indicator_rev.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("regional_indicator_rev.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref REGIONAL_INDICATOR_REV: ::regex_automata::DenseDFA<&'static [u8], u8> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref REGIONAL_INDICATOR_REV: ::regex_automata::DenseDFA<&'static [u8], u8> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("regional_indicator_rev.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("regional_indicator_rev.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/fsm/sentence_break_fwd.rs b/src/unicode/fsm/sentence_break_fwd.rs
index 46ecfcf..cc937a4 100644
--- a/src/unicode/fsm/sentence_break_fwd.rs
+++ b/src/unicode/fsm/sentence_break_fwd.rs
@@ -2,40 +2,44 @@
 //
 //   ucd-generate dfa --name SENTENCE_BREAK_FWD --minimize --sparse --anchored --state-size 4 src/unicode/fsm/ [snip (arg too long)]
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref SENTENCE_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref SENTENCE_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("sentence_break_fwd.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("sentence_break_fwd.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref SENTENCE_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref SENTENCE_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("sentence_break_fwd.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("sentence_break_fwd.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/fsm/simple_word_fwd.rs b/src/unicode/fsm/simple_word_fwd.rs
index c5fabe3..f1f3da5 100644
--- a/src/unicode/fsm/simple_word_fwd.rs
+++ b/src/unicode/fsm/simple_word_fwd.rs
@@ -2,40 +2,44 @@
 //
 //   ucd-generate dfa --name SIMPLE_WORD_FWD --sparse --minimize --state-size 2 src/unicode/fsm/ \w
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref SIMPLE_WORD_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref SIMPLE_WORD_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("simple_word_fwd.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("simple_word_fwd.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref SIMPLE_WORD_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref SIMPLE_WORD_FWD: ::regex_automata::SparseDFA<&'static [u8], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("simple_word_fwd.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("simple_word_fwd.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/fsm/whitespace_anchored_fwd.rs b/src/unicode/fsm/whitespace_anchored_fwd.rs
index ea68582..419b5d4 100644
--- a/src/unicode/fsm/whitespace_anchored_fwd.rs
+++ b/src/unicode/fsm/whitespace_anchored_fwd.rs
@@ -2,40 +2,44 @@
 //
 //   ucd-generate dfa --name WHITESPACE_ANCHORED_FWD --anchored --classes --premultiply --minimize --state-size 1 src/unicode/fsm/ \s+
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref WHITESPACE_ANCHORED_FWD: ::regex_automata::DenseDFA<&'static [u8], u8> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref WHITESPACE_ANCHORED_FWD: ::regex_automata::DenseDFA<&'static [u8], u8> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("whitespace_anchored_fwd.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("whitespace_anchored_fwd.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref WHITESPACE_ANCHORED_FWD: ::regex_automata::DenseDFA<&'static [u8], u8> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref WHITESPACE_ANCHORED_FWD: ::regex_automata::DenseDFA<&'static [u8], u8> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("whitespace_anchored_fwd.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("whitespace_anchored_fwd.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa b/src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa
index bb217f1..427d3a9 100644
--- a/src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa
+++ b/src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa
diff --git a/src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa b/src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa
index a7cb5a7..7cc3a0a 100644
--- a/src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa
+++ b/src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa
diff --git a/src/unicode/fsm/whitespace_anchored_rev.rs b/src/unicode/fsm/whitespace_anchored_rev.rs
index 72b444e..301b03c 100644
--- a/src/unicode/fsm/whitespace_anchored_rev.rs
+++ b/src/unicode/fsm/whitespace_anchored_rev.rs
@@ -1,41 +1,45 @@
 // DO NOT EDIT THIS FILE. IT WAS AUTOMATICALLY GENERATED BY:
 //
-//   ucd-generate dfa --name WHITESPACE_ANCHORED_REV --reverse --anchored --classes --minimize --state-size 1 src/unicode/fsm/ \s+
+//   ucd-generate dfa --name WHITESPACE_ANCHORED_REV --reverse --anchored --classes --premultiply --minimize --state-size 2 src/unicode/fsm/ \s+
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref WHITESPACE_ANCHORED_REV: ::regex_automata::DenseDFA<&'static [u8], u8> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref WHITESPACE_ANCHORED_REV: ::regex_automata::DenseDFA<&'static [u16], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u16; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("whitespace_anchored_rev.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("whitespace_anchored_rev.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref WHITESPACE_ANCHORED_REV: ::regex_automata::DenseDFA<&'static [u8], u8> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref WHITESPACE_ANCHORED_REV: ::regex_automata::DenseDFA<&'static [u16], u16> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u16; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("whitespace_anchored_rev.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("whitespace_anchored_rev.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::DenseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/fsm/word_break_fwd.rs b/src/unicode/fsm/word_break_fwd.rs
index 52e6bc2..fb041b7 100644
--- a/src/unicode/fsm/word_break_fwd.rs
+++ b/src/unicode/fsm/word_break_fwd.rs
@@ -2,40 +2,44 @@
 //
 //   ucd-generate dfa --name WORD_BREAK_FWD --sparse --minimize --anchored --state-size 4 src/unicode/fsm/ [snip (arg too long)]
 //
-// ucd-generate 0.2.8 is available on crates.io.
+// ucd-generate 0.2.9 is available on crates.io.
 
 #[cfg(target_endian = "big")]
-lazy_static! {
-    pub static ref WORD_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref WORD_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("word_break_fwd.bigendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("word_break_fwd.bigendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
 
 #[cfg(target_endian = "little")]
-lazy_static! {
-    pub static ref WORD_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
-        #[repr(C)]
-        struct Aligned<B: ?Sized> {
-            _align: [u8; 0],
-            bytes: B,
-        }
+lazy_static::lazy_static! {
+  pub static ref WORD_BREAK_FWD: ::regex_automata::SparseDFA<&'static [u8], u32> = {
+    #[repr(C)]
+    struct Aligned<B: ?Sized> {
+        _align: [u8; 0],
+        bytes: B,
+    }
 
-        static ALIGNED: &'static Aligned<[u8]> = &Aligned {
-            _align: [],
-            bytes: *include_bytes!("word_break_fwd.littleendian.dfa"),
-        };
-
-        unsafe { ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes) }
+    static ALIGNED: &'static Aligned<[u8]> = &Aligned {
+        _align: [],
+        bytes: *include_bytes!("word_break_fwd.littleendian.dfa"),
     };
+
+    unsafe {
+      ::regex_automata::SparseDFA::from_bytes(&ALIGNED.bytes)
+    }
+  };
 }
diff --git a/src/unicode/grapheme.rs b/src/unicode/grapheme.rs
index e40a0de..ad31cf1 100644
--- a/src/unicode/grapheme.rs
+++ b/src/unicode/grapheme.rs
@@ -1,10 +1,10 @@
 use regex_automata::DFA;
 
-use ext_slice::ByteSlice;
-use unicode::fsm::grapheme_break_fwd::GRAPHEME_BREAK_FWD;
-use unicode::fsm::grapheme_break_rev::GRAPHEME_BREAK_REV;
-use unicode::fsm::regional_indicator_rev::REGIONAL_INDICATOR_REV;
-use utf8;
+use crate::ext_slice::ByteSlice;
+use crate::unicode::fsm::grapheme_break_fwd::GRAPHEME_BREAK_FWD;
+use crate::unicode::fsm::grapheme_break_rev::GRAPHEME_BREAK_REV;
+use crate::unicode::fsm::regional_indicator_rev::REGIONAL_INDICATOR_REV;
+use crate::utf8;
 
 /// An iterator over grapheme clusters in a byte string.
 ///
@@ -262,8 +262,8 @@ mod tests {
     use ucd_parse::GraphemeClusterBreakTest;
 
     use super::*;
-    use ext_slice::ByteSlice;
-    use tests::LOSSY_TESTS;
+    use crate::ext_slice::ByteSlice;
+    use crate::tests::LOSSY_TESTS;
 
     #[test]
     fn forward_ucd() {
diff --git a/src/unicode/sentence.rs b/src/unicode/sentence.rs
index 01f5473..063f342 100644
--- a/src/unicode/sentence.rs
+++ b/src/unicode/sentence.rs
@@ -1,8 +1,8 @@
 use regex_automata::DFA;
 
-use ext_slice::ByteSlice;
-use unicode::fsm::sentence_break_fwd::SENTENCE_BREAK_FWD;
-use utf8;
+use crate::ext_slice::ByteSlice;
+use crate::unicode::fsm::sentence_break_fwd::SENTENCE_BREAK_FWD;
+use crate::utf8;
 
 /// An iterator over sentences in a byte string.
 ///
@@ -160,7 +160,7 @@ fn decode_sentence(bs: &[u8]) -> (&str, usize) {
 mod tests {
     use ucd_parse::SentenceBreakTest;
 
-    use ext_slice::ByteSlice;
+    use crate::ext_slice::ByteSlice;
 
     #[test]
     fn forward_ucd() {
diff --git a/src/unicode/whitespace.rs b/src/unicode/whitespace.rs
index a8da144..949a83f 100644
--- a/src/unicode/whitespace.rs
+++ b/src/unicode/whitespace.rs
@@ -1,7 +1,7 @@
 use regex_automata::DFA;
 
-use unicode::fsm::whitespace_anchored_fwd::WHITESPACE_ANCHORED_FWD;
-use unicode::fsm::whitespace_anchored_rev::WHITESPACE_ANCHORED_REV;
+use crate::unicode::fsm::whitespace_anchored_fwd::WHITESPACE_ANCHORED_FWD;
+use crate::unicode::fsm::whitespace_anchored_rev::WHITESPACE_ANCHORED_REV;
 
 /// Return the first position of a non-whitespace character.
 pub fn whitespace_len_fwd(slice: &[u8]) -> usize {
diff --git a/src/unicode/word.rs b/src/unicode/word.rs
index 1260e52..e0a5701 100644
--- a/src/unicode/word.rs
+++ b/src/unicode/word.rs
@@ -1,9 +1,9 @@
 use regex_automata::DFA;
 
-use ext_slice::ByteSlice;
-use unicode::fsm::simple_word_fwd::SIMPLE_WORD_FWD;
-use unicode::fsm::word_break_fwd::WORD_BREAK_FWD;
-use utf8;
+use crate::ext_slice::ByteSlice;
+use crate::unicode::fsm::simple_word_fwd::SIMPLE_WORD_FWD;
+use crate::unicode::fsm::word_break_fwd::WORD_BREAK_FWD;
+use crate::utf8;
 
 /// An iterator over words in a byte string.
 ///
@@ -320,7 +320,7 @@ fn decode_word(bs: &[u8]) -> (&str, usize) {
 mod tests {
     use ucd_parse::WordBreakTest;
 
-    use ext_slice::ByteSlice;
+    use crate::ext_slice::ByteSlice;
 
     #[test]
     fn forward_ucd() {