rust-analyzer

diff --git a/crates/hir-ty/src/next_solver/infer/mod.rs b/crates/hir-ty/src/next_solver/infer/mod.rs
index 6b6dd549b3..2c2f7dbf67 100644
--- a/crates/hir-ty/src/next_solver/infer/mod.rs
+++ b/crates/hir-ty/src/next_solver/infer/mod.rs

@@ -843,7 +843,7 @@ impl<'db> InferCtxt<'db> {

GenericArgs::for_item(self.interner, def_id, |_index, kind, _| self.var_for_def(kind, span))

}

- /// Like `fresh_args_for_item()`, but first uses the args from `first`.

+ /// Like [`Self::fresh_args_for_item`], but first uses the args from `first`.

pub fn fill_rest_fresh_args(

&self,

span: Span,

diff --git a/crates/hir-ty/src/traits.rs b/crates/hir-ty/src/traits.rs
index 4c76ae901d..3b5890e5e4 100644
--- a/crates/hir-ty/src/traits.rs
+++ b/crates/hir-ty/src/traits.rs

@@ -20,7 +20,7 @@ use hir_expand::name::Name;

use intern::sym;

use rustc_type_ir::{

TypeVisitableExt, TypingMode,

- inherent::{BoundExistentialPredicates, IntoKind},

+ inherent::{BoundExistentialPredicates, GenericArg as _, IntoKind, Ty as _},

};

use crate::{

@@ -153,6 +153,9 @@ pub fn implements_trait_unique_with_infcx<'db>(

let infcx = interner.infer_ctxt().build(TypingMode::non_body_analysis());

let args = create_args(&infcx);

+ if args.iter().filter_map(|it| it.as_type()).any(|ty| ty.is_ty_error()) {

+ return false;

+ }

let trait_ref = rustc_type_ir::TraitRef::new_from_args(interner, trait_.into(), args);

let obligation = Obligation::new(interner, ObligationCause::dummy(), env.param_env, trait_ref);

diff --git a/crates/ide-completion/src/render.rs b/crates/ide-completion/src/render.rs
index e48847c983..7cb1eaa061 100644
--- a/crates/ide-completion/src/render.rs
+++ b/crates/ide-completion/src/render.rs

@@ -2372,7 +2372,7 @@ impl S {

}

fn foo(s: S) { s.$0 }

"#,

- CompletionItemKind::SymbolKind(SymbolKind::Method),

+ SymbolKind::Method,

expect![[r#"

[

CompletionItem {

diff --git a/crates/ide-completion/src/tests/expression.rs b/crates/ide-completion/src/tests/expression.rs
index 57f067dc94..adf4dda184 100644
--- a/crates/ide-completion/src/tests/expression.rs
+++ b/crates/ide-completion/src/tests/expression.rs

@@ -4179,3 +4179,31 @@ fn main() {

"#]],

);

}

+#[test]

+fn no_await_on_error_type() {

+ check(

+ r#"

+//- minicore: future

+fn foo(t: T) {

+ let _ = t.$0;

+ "#,

+ expect![[r#"

+ sn box Box::new(expr)

+ sn call function(expr)

+ sn const const {}

+ sn dbg dbg!(expr)

+ sn dbgr dbg!(&expr)

+ sn deref *expr

+ sn if if expr {}

+ sn match match expr {}

+ sn not !expr

+ sn ref &expr

+ sn refm &mut expr

+ sn return return expr

+ sn unsafe unsafe {}

+ sn while while expr {}

+ "#]],

+ );

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
index 1184739cc2..2f2c7f251a 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html

@@ -128,9 +128,9 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

let y = &mut x;

let z = &y;

- let Foo { x: z, y } = Foo { x: z, y };

+ let Foo { x: z, y } = Foo { x: z, y };

- y;

+ y;

let mut foo = Foo { x, y: x };

let foo2 = Foo { x, y: x };

@@ -143,7 +143,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

copy.qux();

copy.baz(copy);

- let a = |x| x;

+ let a = |x| x;

let bar = Foo::baz;

let baz = (-42,);

@@ -173,13 +173,13 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

}

async fn learn_and_sing() {

- let song = learn_song().await;

- sing_song(song).await;

+ let song = learn_song().await;

+ sing_song(song).await;

}

async fn async_main() {

let f1 = learn_and_sing();

- let f2 = dance();

+ let f2 = dance();

futures::join!(f1, f2);

}