bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix rebase

Browse source
This commit is contained in:
Esteban Küber 2024-02-22 18:38:10 +00:00
parent d67dcf5a8b
commit 91d0b371ef
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View file

@ -562,7 +562,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
None None
}; };
let suggest_confusable = |err: &mut Diagnostic| { let suggest_confusable = |err: &mut DiagnosticBuilder<'_>| {
let Some(call_name) = call_ident else { let Some(call_name) = call_ident else {
return; return;
}; };

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

@ -1418,7 +1418,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
fn find_likely_intended_associated_item( fn find_likely_intended_associated_item(
&self, &self,
err: &mut Diagnostic, err: &mut DiagnosticBuilder<'_>,
similar_candidate: ty::AssocItem, similar_candidate: ty::AssocItem,
span: Span, span: Span,
args: Option<&'tcx [hir::Expr<'tcx>]>, args: Option<&'tcx [hir::Expr<'tcx>]>,
@ -1496,7 +1496,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
pub(crate) fn confusable_method_name( pub(crate) fn confusable_method_name(
&self, &self,
err: &mut Diagnostic, err: &mut DiagnosticBuilder<'_>,
rcvr_ty: Ty<'tcx>, rcvr_ty: Ty<'tcx>,
item_name: Ident, item_name: Ident,
call_args: Option<Vec<Ty<'tcx>>>, call_args: Option<Vec<Ty<'tcx>>>,

2
tests/ui/impl-trait/where-allowed.stderr
View file

@ -395,6 +395,8 @@ error[E0599]: no function or associated item named `into_vec` found for slice `[
LL | vec![vec![0; 10], vec![12; 7], vec![8; 3]] LL | vec![vec![0; 10], vec![12; 7], vec![8; 3]]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `[_]` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `[_]`
| |
help: there is an associated function `to_vec` with a similar name
--> $SRC_DIR/alloc/src/slice.rs:LL:COL
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
error[E0053]: method `in_trait_impl_return` has an incompatible type for trait error[E0053]: method `in_trait_impl_return` has an incompatible type for trait

9
tests/ui/ufcs/bad-builder.stderr
View file

@ -2,10 +2,7 @@ error[E0599]: no function or associated item named `mew` found for struct `Vec<Q
--> $DIR/bad-builder.rs:2:15 --> $DIR/bad-builder.rs:2:15
| |
LL | Vec::<Q>::mew() LL | Vec::<Q>::mew()
| ^^^ | ^^^ function or associated item not found in `Vec<Q>`
| |
| function or associated item not found in `Vec<Q>`
| help: there is an associated function with a similar name: `new`
| |
note: if you're trying to build a new `Vec<Q>` consider using one of the following associated functions: note: if you're trying to build a new `Vec<Q>` consider using one of the following associated functions:
Vec::<T>::new Vec::<T>::new
@ -14,6 +11,10 @@ note: if you're trying to build a new `Vec<Q>` consider using one of the followi
Vec::<T, A>::new_in Vec::<T, A>::new_in
and 2 others and 2 others
--> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
help: there is an associated function `new` with a similar name
|
LL | Vec::<Q>::new()
| ~~~
error: aborting due to 1 previous error error: aborting due to 1 previous error