Skip to content

Commit 849cde9

Browse files
committed
refactor: remove some easy to remove unwrap() calls
1 parent b4cd99f commit 849cde9

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/configure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ async fn configure(ctx: &Context, param: &EnteredLoginParam) -> Result<Option<&'
525525
progress!(ctx, 850);
526526

527527
// Wait for SMTP configuration
528-
smtp_config_task.await.unwrap()?;
528+
smtp_config_task.await??;
529529

530530
progress!(ctx, 900);
531531

src/mimeparser.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,9 @@ impl MimeMessage {
679679
fn parse_system_message_headers(&mut self, context: &Context) {
680680
if self.get_header(HeaderDef::AutocryptSetupMessage).is_some() && !self.incoming {
681681
self.parts.retain(|part| {
682-
part.mimetype.is_none()
683-
|| part.mimetype.as_ref().unwrap().as_ref() == MIME_AC_SETUP_FILE
682+
part.mimetype
683+
.as_ref()
684+
.is_none_or(|mimetype| mimetype.as_ref() == MIME_AC_SETUP_FILE)
684685
});
685686

686687
if self.parts.len() == 1 {

src/scheduler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ impl SchedulerState {
145145
InnerSchedulerState::Started(_) => {
146146
let new_state = InnerSchedulerState::Paused {
147147
started: true,
148-
pause_guards_count: NonZeroUsize::new(1).unwrap(),
148+
pause_guards_count: NonZeroUsize::MIN,
149149
};
150150
Self::do_stop(&mut inner, context, new_state).await;
151151
}
152152
InnerSchedulerState::Stopped => {
153153
*inner = InnerSchedulerState::Paused {
154154
started: false,
155-
pause_guards_count: NonZeroUsize::new(1).unwrap(),
155+
pause_guards_count: NonZeroUsize::MIN,
156156
};
157157
}
158158
InnerSchedulerState::Paused {
@@ -183,7 +183,7 @@ impl SchedulerState {
183183
ref started,
184184
ref mut pause_guards_count,
185185
} => {
186-
if *pause_guards_count == NonZeroUsize::new(1).unwrap() {
186+
if *pause_guards_count == NonZeroUsize::MIN {
187187
match *started {
188188
true => SchedulerState::do_start(&mut inner, &context).await,
189189
false => *inner = InnerSchedulerState::Stopped,

0 commit comments

Comments
 (0)