Skip to content

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Jan 29, 2025

rust-lang/rust-analyzer#19044 and rust-lang/rust-analyzer#18976 both need backporting, but their diffs don't apply cleanly. So instead I opted for disabling one of the problematic diagnostics as well as unconditionally treating rustc_deprecated_safe_2024 items to be safe for now.

r? @cuviper

@Veykril
Copy link
Member Author

Veykril commented Jan 29, 2025

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 29, 2025
@cuviper
Copy link
Member

cuviper commented Jan 30, 2025

OK -- I'll roll this in with other backports, probably tomorrow.

@ehuss ehuss mentioned this pull request Feb 1, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
[beta-1.85] backports

* [Add `AsyncFn*` to `core` prelude](rust-lang#135852)
* [Disable `overflow_delimited_expr` in edition 2024](rust-lang#136312)
* [Disable some incorrect rust-analyzer diagnostics on beta](rust-lang#136236)
    * [fix: Fix #[rustc_deprecated_safe_2024]](rust-lang/rust-analyzer#19044)
    * [fix: Fix a bug where enum variants were not considered properly in type ns resolution](rust-lang/rust-analyzer#18976)
* Update edition-guide
    * [Add alternatives for static-mut-refs](rust-lang/edition-guide#354)
    * [Remove rustfmt-overflow-delimited-expr](rust-lang/edition-guide#357)
@ehuss
Copy link
Contributor

ehuss commented Feb 1, 2025

Closing as merged by #136391.

@ehuss ehuss closed this Feb 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants