diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs index d50088e6cf1d..c92d4e78ffa7 100644 --- a/crates/ide-db/src/generated/lints.rs +++ b/crates/ide-db/src/generated/lints.rs @@ -3869,7 +3869,7 @@ use std::ops::{Coroutine, CoroutineState}; use std::pin::Pin; fn main() { - let mut coroutine = || { + let mut coroutine = #[coroutine] || { yield 1; return "foo" }; @@ -3901,7 +3901,7 @@ use std::ops::Coroutine; use std::pin::Pin; fn main() { - let mut coroutine = || { + let mut coroutine = #[coroutine] || { println!("2"); yield; println!("4"); @@ -4007,7 +4007,7 @@ use std::pin::Pin; fn main() { let ret = "foo"; - let mut coroutine = move || { + let mut coroutine = #[coroutine] move || { yield 1; return ret }; diff --git a/crates/parser/src/lexed_str.rs b/crates/parser/src/lexed_str.rs index 48e4c8a6225c..e5fec67de706 100644 --- a/crates/parser/src/lexed_str.rs +++ b/crates/parser/src/lexed_str.rs @@ -178,7 +178,7 @@ impl<'a> Converter<'a> { rustc_lexer::TokenKind::Ident => { SyntaxKind::from_keyword(token_text).unwrap_or(IDENT) } - rustc_lexer::TokenKind::InvalidIdent => { + rustc_lexer::TokenKind::InvalidPrefix | rustc_lexer::TokenKind::InvalidIdent => { err = "Ident contains invalid characters"; IDENT } diff --git a/rust-version b/rust-version index e69de29bb2d1..9cb57a1bf8f2 100644 --- a/rust-version +++ b/rust-version @@ -0,0 +1 @@ +35194e76b769d57ecb243b202228cce24158041b diff --git a/xtask/src/release.rs b/xtask/src/release.rs index 5699053a23d0..1dc0004f8658 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs @@ -219,12 +219,12 @@ impl flags::RustcPush { /// Used for rustc syncs. const JOSH_FILTER: &str = ":rev(55d9a533b309119c8acd13061581b43ae8840823:prefix=src/tools/rust-analyzer):/src/tools/rust-analyzer"; -const JOSH_PORT: &str = "42042"; +const JOSH_PORT: &str = "42043"; fn start_josh() -> anyhow::Result { // Determine cache directory. let local_dir = { - let user_dirs = ProjectDirs::from("org", "rust-lang", "rust-analyzer-josh").unwrap(); + let user_dirs = ProjectDirs::from("org", "rust-lang", "rust-analyzer-josh-dev").unwrap(); user_dirs.cache_dir().to_owned() };