Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor refactorings #5

Merged
merged 2 commits into from
Dec 29, 2023
Merged

Minor refactorings #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62e8517
`get(0)` → `first()`
Jules-Bertholet Dec 29, 2023
6920a6a
Replace an `unwrap` with let-else
Jules-Bertholet Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/geometry/compile/reads.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ pub fn validate_geometry(
let mut iter = geom.iter();

loop {
let next = iter.next();

if next.is_none() {
let Some(next) = iter.next() else {
break;
}
};

let gm = match next.unwrap() {
let gm = match next {
(Interval::Named(l), _) => map.get(l).unwrap(),
(Interval::Temporary(gp_), _) => gp_,
};
Expand Down
6 changes: 3 additions & 3 deletions src/geometry/interpret.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ impl GeometryMeta {
let (type_, size, self_label, mut stack) = self.unpack();

let (init_label, cur_label) = labels(label);
let seq_name = label.get(0).unwrap();
let seq_name = label.first().unwrap();

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

let (init_label, cur_label) = labels(label);
let seq_name = label.get(0).unwrap();
let seq_name = label.first().unwrap();

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

let (init_label, cur_label) = labels(label);
let seq_name = label.get(0).unwrap();
let seq_name = label.first().unwrap();

let mut left_label = label.to_owned();

Expand Down