Skip to content

Commit f45c281

Browse files
authored
Merge pull request #5 from Jules-Bertholet/minor-refactorings
Minor refactorings
2 parents bf7a738 + 6920a6a commit f45c281

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/geometry/compile/reads.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ pub fn validate_geometry(
2020
let mut iter = geom.iter();
2121

2222
loop {
23-
let next = iter.next();
24-
25-
if next.is_none() {
23+
let Some(next) = iter.next() else {
2624
break;
27-
}
25+
};
2826

29-
let gm = match next.unwrap() {
27+
let gm = match next {
3028
(Interval::Named(l), _) => map.get(l).unwrap(),
3129
(Interval::Temporary(gp_), _) => gp_,
3230
};

src/geometry/interpret.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ impl GeometryMeta {
217217
let (type_, size, self_label, mut stack) = self.unpack();
218218

219219
let (init_label, cur_label) = labels(label);
220-
let seq_name = label.get(0).unwrap();
220+
let seq_name = label.first().unwrap();
221221

222222
let this_label = if let Some(l) = self_label {
223223
format!("{seq_name}{l}")
@@ -253,7 +253,7 @@ impl GeometryMeta {
253253
let (type_, size, self_label, mut stack) = self.unpack();
254254

255255
let (init_label, cur_label) = labels(label);
256-
let seq_name = label.get(0).unwrap();
256+
let seq_name = label.first().unwrap();
257257

258258
let this_label = if let Some(l) = self_label {
259259
format!("{seq_name}{l}")
@@ -321,7 +321,7 @@ impl GeometryMeta {
321321
// execute the processing for next
322322

323323
let (init_label, cur_label) = labels(label);
324-
let seq_name = label.get(0).unwrap();
324+
let seq_name = label.first().unwrap();
325325

326326
let mut left_label = label.to_owned();
327327

0 commit comments

Comments
 (0)