From fe89bc69712e2d31373520252bb0eac6ec10d8fb Mon Sep 17 00:00:00 2001 From: Yoh Deadfall Date: Sun, 21 Mar 2021 16:21:57 +0100 Subject: [PATCH] Updated edition to 2018 --- Cargo.toml | 1 + src/grapheme.rs | 16 ++++++++-------- src/sentence.rs | 8 ++++---- src/word.rs | 14 +++++++------- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3f55167..bf237cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ name = "unicode-segmentation" version = "1.7.1" authors = ["kwantam ", "Manish Goregaokar "] +edition = "2018" homepage = "https://github.com/unicode-rs/unicode-segmentation" repository = "https://github.com/unicode-rs/unicode-segmentation" documentation = "https://unicode-rs.github.io/unicode-segmentation" diff --git a/src/grapheme.rs b/src/grapheme.rs index e95d478..ef9e1a1 100644 --- a/src/grapheme.rs +++ b/src/grapheme.rs @@ -10,7 +10,7 @@ use core::cmp; -use tables::grapheme::GraphemeCat; +use crate::tables::grapheme::GraphemeCat; /// External iterator for grapheme clusters and byte offsets. /// @@ -229,7 +229,7 @@ enum PairResult { } fn check_pair(before: GraphemeCat, after: GraphemeCat) -> PairResult { - use tables::grapheme::GraphemeCat::*; + use crate::tables::grapheme::GraphemeCat::*; use self::PairResult::*; match (before, after) { (GC_CR, GC_LF) => NotBreak, // GB3 @@ -295,8 +295,8 @@ impl GraphemeCursor { } fn grapheme_category(&mut self, ch: char) -> GraphemeCat { - use tables::grapheme as gr; - use tables::grapheme::GraphemeCat::*; + use crate::tables::grapheme as gr; + use crate::tables::grapheme::GraphemeCat::*; if ch <= '\u{7e}' { // Special-case optimization for ascii, except U+007F. This @@ -387,7 +387,7 @@ impl GraphemeCursor { /// assert_eq!(cursor.is_boundary(&flags[8..], 8), Ok(true)); /// ``` pub fn provide_context(&mut self, chunk: &str, chunk_start: usize) { - use tables::grapheme as gr; + use crate::tables::grapheme as gr; assert!(chunk_start + chunk.len() == self.pre_context_offset.unwrap()); self.pre_context_offset = None; if self.is_extended && chunk_start + chunk.len() == self.offset { @@ -433,7 +433,7 @@ impl GraphemeCursor { } fn handle_regional(&mut self, chunk: &str, chunk_start: usize) { - use tables::grapheme as gr; + use crate::tables::grapheme as gr; let mut ris_count = self.ris_count.unwrap_or(0); for ch in chunk.chars().rev() { if self.grapheme_category(ch) != gr::GC_Regional_Indicator { @@ -453,7 +453,7 @@ impl GraphemeCursor { } fn handle_emoji(&mut self, chunk: &str, chunk_start: usize) { - use tables::grapheme as gr; + use crate::tables::grapheme as gr; let mut iter = chunk.chars().rev(); if let Some(ch) = iter.next() { if self.grapheme_category(ch) != gr::GC_ZWJ { @@ -506,7 +506,7 @@ impl GraphemeCursor { /// assert_eq!(cursor.is_boundary(flags, 0), Ok(false)); /// ``` pub fn is_boundary(&mut self, chunk: &str, chunk_start: usize) -> Result { - use tables::grapheme as gr; + use crate::tables::grapheme as gr; if self.state == GraphemeState::Break { return Ok(true) } diff --git a/src/sentence.rs b/src/sentence.rs index 275da52..0a23abd 100644 --- a/src/sentence.rs +++ b/src/sentence.rs @@ -13,7 +13,7 @@ use core::iter::Filter; // All of the logic for forward iteration over sentences mod fwd { - use tables::sentence::SentenceCat; + use crate::tables::sentence::SentenceCat; use core::cmp; // Describe a parsed part of source string as described in this table: @@ -111,7 +111,7 @@ mod fwd { if parts[idx] == StatePart::ClosePlus { idx -= 1 } if parts[idx] == StatePart::ATerm { - use tables::sentence as se; + use crate::tables::sentence as se; for next_char in ahead.chars() { //( ¬(OLetter | Upper | Lower | ParaSep | SATerm) )* Lower @@ -176,7 +176,7 @@ mod fwd { #[inline] fn next(&mut self) -> Option { - use tables::sentence as se; + use crate::tables::sentence as se; for next_char in self.string[self.pos..].chars() { let position_before = self.pos; @@ -331,7 +331,7 @@ pub fn new_sentence_bound_indices<'a>(source: &'a str) -> USentenceBoundIndices< #[inline] pub fn new_unicode_sentences<'b>(s: &'b str) -> UnicodeSentences<'b> { use super::UnicodeSegmentation; - use tables::util::is_alphanumeric; + use crate::tables::util::is_alphanumeric; fn has_alphanumeric(s: &&str) -> bool { s.chars().any(|c| is_alphanumeric(c)) } let has_alphanumeric: fn(&&str) -> bool = has_alphanumeric; // coerce to fn pointer diff --git a/src/word.rs b/src/word.rs index 179d122..4865e5c 100644 --- a/src/word.rs +++ b/src/word.rs @@ -11,7 +11,7 @@ use core::cmp; use core::iter::Filter; -use tables::word::WordCat; +use crate::tables::word::WordCat; /// An iterator over the substrings of a string which, after splitting the string on /// [word boundaries](http://www.unicode.org/reports/tr29/#Word_Boundaries), @@ -142,7 +142,7 @@ enum RegionalState { } fn is_emoji(ch: char) -> bool { - use tables::emoji; + use crate::tables::emoji; emoji::emoji_category(ch).2 == emoji::EmojiCat::EC_Extended_Pictographic } @@ -159,7 +159,7 @@ impl<'a> Iterator for UWordBounds<'a> { fn next(&mut self) -> Option<&'a str> { use self::UWordBoundsState::*; use self::FormatExtendType::*; - use tables::word as wd; + use crate::tables::word as wd; if self.string.len() == 0 { return None; } @@ -386,7 +386,7 @@ impl<'a> DoubleEndedIterator for UWordBounds<'a> { fn next_back(&mut self) -> Option<&'a str> { use self::UWordBoundsState::*; use self::FormatExtendType::*; - use tables::word as wd; + use crate::tables::word as wd; if self.string.len() == 0 { return None; } @@ -638,7 +638,7 @@ impl<'a> UWordBounds<'a> { #[inline] fn get_next_cat(&self, idx: usize) -> Option { - use tables::word as wd; + use crate::tables::word as wd; let nidx = idx + self.string[idx..].chars().next().unwrap().len_utf8(); if nidx < self.string.len() { let nch = self.string[nidx..].chars().next().unwrap(); @@ -650,7 +650,7 @@ impl<'a> UWordBounds<'a> { #[inline] fn get_prev_cat(&self, idx: usize) -> Option { - use tables::word as wd; + use crate::tables::word as wd; if idx > 0 { let nch = self.string[..idx].chars().next_back().unwrap(); Some(wd::word_category(nch).2) @@ -673,7 +673,7 @@ pub fn new_word_bound_indices<'b>(s: &'b str) -> UWordBoundIndices<'b> { #[inline] pub fn new_unicode_words<'b>(s: &'b str) -> UnicodeWords<'b> { use super::UnicodeSegmentation; - use tables::util::is_alphanumeric; + use crate::tables::util::is_alphanumeric; fn has_alphanumeric(s: &&str) -> bool { s.chars().any(|c| is_alphanumeric(c)) } let has_alphanumeric: fn(&&str) -> bool = has_alphanumeric; // coerce to fn pointer