bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove dead NoneError error handling

Browse source
This commit is contained in:
mejrs 2022-11-13 22:48:27 +01:00
parent 928d14bcd1
commit 25acee5494
2 changed files with 8 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_span/src/symbol.rs
View file

@ -1035,7 +1035,6 @@ symbols! {
non_exhaustive, non_exhaustive,
non_exhaustive_omitted_patterns_lint, non_exhaustive_omitted_patterns_lint,
non_modrs_mods, non_modrs_mods,
none_error,
nontemporal_store, nontemporal_store,
noop_method_borrow, noop_method_borrow,
noop_method_clone, noop_method_clone,

29
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
View file

@ -650,33 +650,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
)) ))
); );
if is_try_conversion { if is_try_conversion && let Some(ret_span) = self.return_type_span(&obligation) {
let none_error = self
.tcx
.get_diagnostic_item(sym::none_error)
.map(|def_id| tcx.type_of(def_id));
let should_convert_option_to_result =
Some(trait_ref.skip_binder().substs.type_at(1)) == none_error;
let should_convert_result_to_option =
Some(trait_ref.self_ty().skip_binder()) == none_error;
if should_convert_option_to_result {
err.span_suggestion_verbose(
span.shrink_to_lo(),
"consider converting the `Option<T>` into a `Result<T, _>` \
using `Option::ok_or` or `Option::ok_or_else`",
".ok_or_else(|| /* error value */)",
Applicability::HasPlaceholders,
);
} else if should_convert_result_to_option {
err.span_suggestion_verbose(
span.shrink_to_lo(),
"consider converting the `Result<T, _>` into an `Option<T>` \
using `Result::ok`",
".ok()",
Applicability::MachineApplicable,
);
}
if let Some(ret_span) = self.return_type_span(&obligation) {
err.span_label( err.span_label(
ret_span, ret_span,
&format!( &format!(
@ -685,7 +659,6 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
), ),
); );
} }
}
if Some(trait_ref.def_id()) == tcx.lang_items().tuple_trait() { if Some(trait_ref.def_id()) == tcx.lang_items().tuple_trait() {
match obligation.cause.code().peel_derives() { match obligation.cause.code().peel_derives() {