mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak comments and remove trivial return

Browse source
This commit is contained in:
Michael Goulet 2024-09-29 11:52:25 -04:00
parent 40d413f9fe
commit 486440fc74
2 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_hir_typeck/src/method/mod.rs
View file

@ -46,17 +46,17 @@ pub(crate) struct MethodCallee<'tcx> {
#[derive(Debug)]
pub(crate) enum MethodError<'tcx> {
// Did not find an applicable method, but we did find various near-misses that may work.
/// Did not find an applicable method, but we did find various near-misses that may work.
NoMatch(NoMatchData<'tcx>),
// Multiple methods might apply.
/// Multiple methods might apply.
Ambiguity(Vec<CandidateSource>),
// Found an applicable method, but it is not visible. The third argument contains a list of
// not-in-scope traits which may work.
/// Found an applicable method, but it is not visible. The third argument contains a list of
/// not-in-scope traits which may work.
PrivateMatch(DefKind, DefId, Vec<DefId>),
// Found a `Self: Sized` bound where `Self` is a trait object.
/// Found a `Self: Sized` bound where `Self` is a trait object.
IllegalSizedBound {
candidates: Vec<DefId>,
needs_mut: bool,
@ -64,10 +64,10 @@ pub(crate) enum MethodError<'tcx> {
self_expr: &'tcx hir::Expr<'tcx>,
},
// Found a match, but the return type is wrong
/// Found a match, but the return type is wrong
BadReturnType,
// Error has already been emitted, no need to emit another one.
/// Error has already been emitted, no need to emit another one.
ErrorReported(ErrorGuaranteed),
}

32
compiler/rustc_hir_typeck/src/method/suggest.rs
View file

@ -229,20 +229,18 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
match error {
MethodError::NoMatch(mut no_match_data) => {
return self.report_no_match_method_error(
span,
rcvr_ty,
item_name,
call_id,
source,
args,
sugg_span,
&mut no_match_data,
expected,
trait_missing_method,
);
}
MethodError::NoMatch(mut no_match_data) => self.report_no_match_method_error(
span,
rcvr_ty,
item_name,
call_id,
source,
args,
sugg_span,
&mut no_match_data,
expected,
trait_missing_method,
),
MethodError::Ambiguity(mut sources) => {
let mut err = struct_span_code_err!(
@ -263,7 +261,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
&mut sources,
Some(sugg_span),
);
return err.emit();
err.emit()
}
MethodError::PrivateMatch(kind, def_id, out_of_scope_traits) => {
@ -284,7 +282,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
.unwrap_or_else(|| self.tcx.def_span(def_id));
err.span_label(sp, format!("private {kind} defined here"));
self.suggest_valid_traits(&mut err, item_name, out_of_scope_traits, true);
return err.emit();
err.emit()
}
MethodError::IllegalSizedBound { candidates, needs_mut, bound_span, self_expr } => {
@ -383,7 +381,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
}
}
return err.emit();
err.emit()
}
MethodError::ErrorReported(guar) => guar,