RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-09-15 03:26:18 +00:00
Code Issues Activity

Remove use of str_char in fmt

Browse source
This commit is contained in:
Florian Gilcher 2016-03-22 21:57:52 +01:00
parent 509d6efc78
commit 2befeef179
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/fmt/fmt.rs
View file

@ -1,5 +1,4 @@
#![crate_name = "uu_fmt"] #![crate_name = "uu_fmt"]
#![feature(str_char)]
/* /*
* This file is part of `fmt` from the uutils coreutils package. * This file is part of `fmt` from the uutils coreutils package.

18
src/fmt/parasplit.rs
View file

@ -10,7 +10,6 @@
use std::iter::Peekable; use std::iter::Peekable;
use std::io::{BufRead, Lines}; use std::io::{BufRead, Lines};
use std::slice::Iter; use std::slice::Iter;
use std::str::CharRange;
use unicode_width::UnicodeWidthChar; use unicode_width::UnicodeWidthChar;
use FileOrStdReader; use FileOrStdReader;
use FmtOptions; use FmtOptions;
@ -100,11 +99,13 @@ impl<'a> FileLines<'a> {
if !exact { if !exact {
// we do it this way rather than byte indexing to support unicode whitespace chars // we do it this way rather than byte indexing to support unicode whitespace chars
let mut i = 0; for (i, char) in line.char_indices() {
while (i < line.len()) && line.char_at(i).is_whitespace() { if char.is_whitespace() {
i = match line.char_range_at(i) { CharRange { next: nxi, .. } => nxi }; if line[i..].starts_with(pfx) {
if line[i..].starts_with(pfx) { return (true, i);
return (true, i); }
} else {
break;
} }
} }
} }
@ -544,8 +545,9 @@ impl<'a> Iterator for WordSplit<'a> {
let is_start_of_sentence = self.prev_punct && (before_tab.is_some() || word_start_relative > 1); let is_start_of_sentence = self.prev_punct && (before_tab.is_some() || word_start_relative > 1);
// now record whether this word ends in punctuation // now record whether this word ends in punctuation
self.prev_punct = match self.string.char_range_at_reverse(self.position) { self.prev_punct = match self.string[..self.position].chars().rev().next() {
CharRange { ch, .. } => WordSplit::is_punctuation(ch) Some(ch) => WordSplit::is_punctuation(ch),
_ => panic!("fatal: expected word not to be empty")
}; };
let (word, word_start_relative, before_tab, after_tab) = let (word, word_start_relative, before_tab, after_tab) =