RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-31 04:57:45 +00:00
Code Issues Activity

Merge pull request #429 from Arcterus/fix-master

Browse source 
cut: fix deprecation warnings
This commit is contained in:
Heather 2014-10-26 07:47:00 +03:00
commit 2ad86775d8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cut/cut.rs
View file

@ -64,7 +64,7 @@ fn cut_bytes<R: Reader>(reader: R,
let mut cur_pos = 1; let mut cur_pos = 1;
let mut print_delim = false; let mut print_delim = false;
for &Range { low: low, high: high } in ranges.iter() { for &Range { low, high } in ranges.iter() {
// skip upto low // skip upto low
let orig_pos = cur_pos; let orig_pos = cur_pos;
loop { loop {
@ -149,7 +149,7 @@ fn cut_characters<R: Reader>(reader: R,
let mut char_indices = line.as_slice().char_indices(); let mut char_indices = line.as_slice().char_indices();
let mut print_delim = false; let mut print_delim = false;
for &Range { low: low, high: high } in ranges.iter() { for &Range { low, high } in ranges.iter() {
let low_idx = match char_indices.nth(low - char_pos - 1) { let low_idx = match char_indices.nth(low - char_pos - 1) {
Some((low_idx, _)) => low_idx, Some((low_idx, _)) => low_idx,
None => break None => break
@ -268,7 +268,7 @@ fn cut_fields_delimiter<R: Reader>(reader: R,
continue continue
} }
for &Range { low: low, high: high } in ranges.iter() { for &Range { low, high } in ranges.iter() {
if low - fields_pos > 0 { if low - fields_pos > 0 {
low_idx = match delim_search.nth(low - fields_pos - 1) { low_idx = match delim_search.nth(low - fields_pos - 1) {
Some((_, beyond_delim)) => beyond_delim, Some((_, beyond_delim)) => beyond_delim,
@ -350,7 +350,7 @@ fn cut_fields<R: Reader>(reader: R,
continue continue
} }
for &Range { low: low, high: high } in ranges.iter() { for &Range { low, high } in ranges.iter() {
if low - fields_pos > 0 { if low - fields_pos > 0 {
low_idx = match delim_search.nth(low - fields_pos - 1) { low_idx = match delim_search.nth(low - fields_pos - 1) {
Some((_, beyond_delim)) => beyond_delim, Some((_, beyond_delim)) => beyond_delim,