Skip to content

Commit fe64525

Browse files
authored
Merge pull request #317 from fox0/clippy--int_plus_one
join: Fix clippy::int_plus_one and add a assert
2 parents 5532eb1 + e1c9ba6 commit fe64525

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

text/join.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,28 @@ fn process_files2(
103103
let mut res: Vec<String> = Vec::new();
104104
for num in order {
105105
let f_num: Vec<&str> = num.split('.').collect();
106+
assert_eq!(f_num.len(), 2);
107+
let mut n: usize = f_num[1].parse()?;
108+
n -= 1;
106109
if f_num[0] == "1" {
107-
if fields1.len() <= f_num[1].parse::<usize>()? - 1 {
110+
if fields1.len() <= n {
108111
if let Some(e) = &e {
109112
res.push(e.to_string());
110113
}
111114
} else {
112-
res.push(fields1[f_num[1].parse::<usize>()? - 1].clone());
115+
res.push(fields1[n].clone());
113116
}
114117
} else if f_num[0] == "2" {
115-
if fields2.len() <= f_num[1].parse::<usize>()? - 1 {
118+
if fields2.len() <= n {
116119
if let Some(e) = &e {
117120
res.push(e.to_string());
118121
}
119122
} else {
120-
res.push(fields2[f_num[1].parse::<usize>()? - 1].clone());
123+
res.push(fields2[n].clone());
121124
}
125+
} else {
126+
// TODO:
127+
panic!("f_num[0] not in (1, 2)");
122128
}
123129
}
124130
if v == 0 {

0 commit comments

Comments
 (0)