nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for `Result<&T, _>'

Browse Source
This commit is contained in:
Lzu Tao 2024-07-13 01:06:40 +00:00
parent 9c1a9e03d5
commit 9c3c278b54
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
View File

@ -1451,9 +1451,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let ty::Adt(callee_adt, _) = callee_ty.peel_refs().kind() else {
return;
};
if !self.tcx.is_diagnostic_item(sym::Option, callee_adt.did()) {
let adt_name = if self.tcx.is_diagnostic_item(sym::Option, callee_adt.did()) {
"Option"
} else if self.tcx.is_diagnostic_item(sym::Result, callee_adt.did()) {
"Result"
} else {
return;
}
};
if call_ident.map_or(true, |ident| ident.name != sym::unwrap_or) {
return;
@ -1484,14 +1488,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
Ok(snip) => (snip, Applicability::MachineApplicable),
Err(_) => ("/* _ */".to_owned(), Applicability::MaybeIncorrect),
};
let sugg = &format!("map_or({provided_snip}, |v| v)");
err.span_suggestion_verbose(
error_span,
"use `Option::map_or` to deref inner value of `Option`",
sugg,
applicability,
);
return;
let sugg = format!("map_or({provided_snip}, |v| v)");
let msg = format!("use `{adt_name}::map_or` to deref inner value of `{adt_name}`");
err.span_suggestion_verbose(error_span, msg, sugg, applicability);
}
/// Suggest wrapping the block in square brackets instead of curly braces

4
tests/ui/mismatched_types/transforming-option-ref-issue-127545.stderr
View File

@ -80,6 +80,10 @@ LL | arg.unwrap_or(&[])
| this argument influences the return type of `unwrap_or`
note: method defined here
--> $SRC_DIR/core/src/result.rs:LL:COL
help: use `Result::map_or` to deref inner value of `Result`
|
LL | arg.map_or(&[], |v| v)
| ~~~~~~~~~~~~~~~~~~
error: aborting due to 4 previous errors