Skip to content

Commit 554ee6e

Browse files
committed
cargo fmt
1 parent b2dbe6e commit 554ee6e

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

crates/hir_ty/src/diagnostics/expr.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use crate::{
1111
db::HirDatabase,
1212
diagnostics::{
1313
match_check::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
14-
MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkOrSomeInTailExpr, MissingPatFields,
15-
RemoveThisSemicolon,
14+
MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkOrSomeInTailExpr,
15+
MissingPatFields, RemoveThisSemicolon,
1616
},
1717
utils::variant_data,
1818
ApplicationTy, InferenceResult, Ty, TypeCtor,
@@ -324,19 +324,22 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
324324
let (params, required) = match &mismatch.expected {
325325
Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &core_result_ctor => {
326326
(parameters, "Ok".to_string())
327-
},
327+
}
328328
Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &core_option_ctor => {
329329
(parameters, "Some".to_string())
330-
},
330+
}
331331
_ => return,
332332
};
333333

334334
if params.len() > 0 && params[0] == mismatch.actual {
335335
let (_, source_map) = db.body_with_source_map(self.owner.into());
336336

337337
if let Ok(source_ptr) = source_map.expr_syntax(id) {
338-
self.sink
339-
.push(MissingOkOrSomeInTailExpr { file: source_ptr.file_id, expr: source_ptr.value, required });
338+
self.sink.push(MissingOkOrSomeInTailExpr {
339+
file: source_ptr.file_id,
340+
expr: source_ptr.value,
341+
required,
342+
});
340343
}
341344
}
342345
}

crates/ide/src/diagnostics/fixes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ impl DiagnosticWithFix for MissingOkOrSomeInTailExpr {
101101
let tail_expr_range = tail_expr.syntax().text_range();
102102
let replacement = format!("{}({})", self.required, tail_expr.syntax());
103103
let edit = TextEdit::replace(tail_expr_range, replacement);
104-
let source_change = SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into();
104+
let source_change =
105+
SourceFileEdit { file_id: self.file.original_file(sema.db), edit }.into();
105106
let name = if self.required == "Ok" { "Wrap with Ok" } else { "Wrap with Some" };
106107
Some(Fix::new(name, source_change, tail_expr_range))
107108
}

0 commit comments

Comments
 (0)