feat(diagnostics): split TraitImplIncorrectSafety into distinct rustc errors
#22463
+301
−157
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Contributor
Author
There was a problem hiding this comment. should I split the file into 5 as well? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| use hir::InFile; | ||
| use syntax::{AstNode, AstPtr, ast}; | ||
|
|
||
| use crate::{Diagnostic, DiagnosticCode, DiagnosticsContext, adjusted_display_range}; | ||
|
|
||
| pub(crate) fn impl_incorrect_safety( | ||
| ctx: &DiagnosticsContext<'_, '_>, | ||
| d: &hir::ImplIncorrectSafety, | ||
| ) -> Diagnostic { | ||
| use hir::ImplIncorrectSafetyKind as Kind; | ||
|
|
||
| let impl_ = InFile { file_id: d.file_id, value: d.impl_ }; | ||
| match d.kind { | ||
| Kind::UnsafeInherentImpl => unsafe_inherent_impl(ctx, impl_), | ||
| Kind::UnsafeNegativeImpl => unsafe_negative_impl(ctx, impl_), | ||
| Kind::UnsafeImplOfSafeTrait(trait_) => unsafe_impl_of_safe_trait(ctx, impl_, trait_), | ||
| Kind::SafeImplOfUnsafeTrait(trait_) => safe_impl_of_unsafe_trait(ctx, impl_, trait_), | ||
| Kind::SafeImplOfDanglingDrop => safe_impl_of_dangling_drop(ctx, impl_), | ||
| } | ||
| } | ||
|
|
||
| // Diagnostic: unsafe-inherent-impl | ||
| // | ||
| // This diagnostic is triggered when an inherent implementation is marked `unsafe` | ||
| fn unsafe_inherent_impl( | ||
| ctx: &DiagnosticsContext<'_, '_>, | ||
| impl_: InFile<AstPtr<ast::Impl>>, | ||
| ) -> Diagnostic { | ||
| Diagnostic::new( | ||
| DiagnosticCode::RustcHardError("E0197"), | ||
| "inherent impls cannot be unsafe", | ||
| adjusted_display_range(ctx, impl_, &|impl_| { | ||
| Some((impl_.unsafe_token()?.text_range()).cover(impl_.self_ty()?.syntax().text_range())) | ||
| }), | ||
| ) | ||
| .with_main_node(impl_.map(Into::into)) | ||
| .stable() | ||
| } | ||
|
|
||
| // Diagnostic: unsafe-negative-impl | ||
| // | ||
| // This diagnostic is triggered when a negative implementation is marked `unsafe` | ||
| fn unsafe_negative_impl( | ||
| ctx: &DiagnosticsContext<'_, '_>, | ||
| impl_: InFile<AstPtr<ast::Impl>>, | ||
| ) -> Diagnostic { | ||
| Diagnostic::new( | ||
| DiagnosticCode::RustcHardError("E0198"), | ||
| "negative impls cannot be unsafe", | ||
| adjusted_display_range(ctx, impl_, &|impl_| { | ||
| Some((impl_.unsafe_token()?.text_range()).cover(impl_.self_ty()?.syntax().text_range())) | ||
| }), | ||
| ) | ||
| .with_main_node(impl_.map(Into::into)) | ||
| .stable() | ||
| } | ||
|
|
||
| // Diagnostic: unsafe-impl-of-safe-trait | ||
| // | ||
| // This diagnostic is triggered when an implementation of a safe trait is marked `unsafe` | ||
| fn unsafe_impl_of_safe_trait( | ||
| ctx: &DiagnosticsContext<'_, '_>, | ||
| impl_: InFile<AstPtr<ast::Impl>>, | ||
| trait_: hir::Trait, | ||
| ) -> Diagnostic { | ||
| let trait_name = trait_.name(ctx.db()); | ||
| let trait_name = trait_name.display(ctx.db(), ctx.edition); | ||
|
|
||
| Diagnostic::new( | ||
| DiagnosticCode::RustcHardError("E0199"), | ||
| format!("implementing the trait `{trait_name}` is not unsafe"), | ||
| adjusted_display_range(ctx, impl_, &|impl_| { | ||
| Some(impl_.unsafe_token()?.text_range().cover(impl_.self_ty()?.syntax().text_range())) | ||
| }), | ||
| ) | ||
| .with_main_node(impl_.map(Into::into)) | ||
| .stable() | ||
| } | ||
|
|
||
| // Diagnostic: safe-impl-of-unsafe-trait | ||
| // | ||
| // This diagnostic is triggered when an implementation of an unsafe trait is missing `unsafe` | ||
| fn safe_impl_of_unsafe_trait( | ||
| ctx: &DiagnosticsContext<'_, '_>, | ||
| impl_: InFile<AstPtr<ast::Impl>>, | ||
| trait_: hir::Trait, | ||
| ) -> Diagnostic { | ||
| let trait_name = trait_.name(ctx.db()); | ||
| let trait_name = trait_name.display(ctx.db(), ctx.edition); | ||
|
|
||
| Diagnostic::new( | ||
| DiagnosticCode::RustcHardError("E0200"), | ||
| format!("the trait `{trait_name}` requires an `unsafe impl` declaration"), | ||
| adjusted_display_range(ctx, impl_, &|impl_| { | ||
| Some(impl_.impl_token()?.text_range().cover(impl_.self_ty()?.syntax().text_range())) | ||
| }), | ||
| ) | ||
| .with_main_node(impl_.map(Into::into)) | ||
| .stable() | ||
| } | ||
|
|
||
| // Diagnostic: safe-impl-of-dangling-drop | ||
| // | ||
| // This diagnostic is triggered when an implementation of `Drop` using `#[may_dangle]` is missing `unsafe` | ||
| fn safe_impl_of_dangling_drop( | ||
| ctx: &DiagnosticsContext<'_, '_>, | ||
| impl_: InFile<AstPtr<ast::Impl>>, | ||
| ) -> Diagnostic { | ||
| Diagnostic::new( | ||
| DiagnosticCode::RustcHardError("E0569"), | ||
| "requires an `unsafe impl` declaration due to `#[may_dangle]` attribute", | ||
| adjusted_display_range(ctx, impl_, &|impl_| { | ||
| Some(impl_.impl_token()?.text_range().cover(impl_.self_ty()?.syntax().text_range())) | ||
| }), | ||
| ) | ||
| .with_main_node(impl_.map(Into::into)) | ||
| .stable() | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use crate::tests::check_diagnostics; | ||
|
|
||
| #[test] | ||
| fn simple() { | ||
| check_diagnostics( | ||
| r#" | ||
| trait Safe {} | ||
| unsafe trait Unsafe {} | ||
|
|
||
| impl Safe for () {} | ||
|
|
||
| impl Unsafe for () {} | ||
| //^^^^^^^^^^^^^^^^^^ error: the trait `Unsafe` requires an `unsafe impl` declaration | ||
|
|
||
| unsafe impl Safe for () {} | ||
| //^^^^^^^^^^^^^^^^^^^^^^^ error: implementing the trait `Safe` is not unsafe | ||
|
|
||
| unsafe impl Unsafe for () {} | ||
| "#, | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn drop_may_dangle() { | ||
| check_diagnostics( | ||
| r#" | ||
| #![feature(lang_items)] | ||
| #[lang = "drop"] | ||
| trait Drop {} | ||
| struct S<T>; | ||
| struct L<'l>; | ||
|
|
||
| impl<T> Drop for S<T> {} | ||
|
|
||
| impl<#[may_dangle] T> Drop for S<T> {} | ||
| //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute | ||
|
|
||
| unsafe impl<T> Drop for S<T> {} | ||
| //^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementing the trait `Drop` is not unsafe | ||
|
|
||
| unsafe impl<#[may_dangle] T> Drop for S<T> {} | ||
|
|
||
| impl<'l> Drop for L<'l> {} | ||
|
|
||
| impl<#[may_dangle] 'l> Drop for L<'l> {} | ||
| //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: requires an `unsafe impl` declaration due to `#[may_dangle]` attribute | ||
|
|
||
| unsafe impl<'l> Drop for L<'l> {} | ||
| //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: implementing the trait `Drop` is not unsafe | ||
|
|
||
| unsafe impl<#[may_dangle] 'l> Drop for L<'l> {} | ||
| "#, | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn negative() { | ||
| check_diagnostics( | ||
| r#" | ||
| trait Trait {} | ||
|
|
||
| impl !Trait for () {} | ||
|
|
||
| unsafe impl !Trait for () {} | ||
| //^^^^^^^^^^^^^^^^^^^^^^^^^ error: negative impls cannot be unsafe | ||
|
|
||
| unsafe trait UnsafeTrait {} | ||
|
|
||
| impl !UnsafeTrait for () {} | ||
|
|
||
| unsafe impl !UnsafeTrait for () {} | ||
| //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: negative impls cannot be unsafe | ||
|
|
||
| "#, | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn inherent() { | ||
| check_diagnostics( | ||
| r#" | ||
| struct S; | ||
|
|
||
| impl S {} | ||
|
|
||
| unsafe impl S {} | ||
| //^^^^^^^^^^^^^ error: inherent impls cannot be unsafe | ||
| "#, | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn unsafe_unresolved_trait() { | ||
| check_diagnostics( | ||
| r#" | ||
| unsafe impl TestTrait for u32 {} | ||
| "#, | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.