Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/hir-ty/src/infer.rs | 2 | ||||
| -rw-r--r-- | crates/hir-ty/src/infer/expr.rs | 2 | ||||
| -rw-r--r-- | crates/hir/src/diagnostics.rs | 8 | ||||
| -rw-r--r-- | crates/ide-diagnostics/src/handlers/union_expr_must_have_exactly_one_field.rs (renamed from crates/ide-diagnostics/src/handlers/union_must_have_exactly_one_field.rs) | 8 | ||||
| -rw-r--r-- | crates/ide-diagnostics/src/lib.rs | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/crates/hir-ty/src/infer.rs b/crates/hir-ty/src/infer.rs index 5dbd5a779e..09c1325c41 100644 --- a/crates/hir-ty/src/infer.rs +++ b/crates/hir-ty/src/infer.rs @@ -455,7 +455,7 @@ pub enum InferenceDiagnostic { at_point: Span, top_term: Option<StoredGenericArg>, }, - UnionMustHaveExactlyOneField { + UnionExprMustHaveExactlyOneField { #[type_visitable(ignore)] expr: ExprId, }, diff --git a/crates/hir-ty/src/infer/expr.rs b/crates/hir-ty/src/infer/expr.rs index 4e721043cf..c59c919c51 100644 --- a/crates/hir-ty/src/infer/expr.rs +++ b/crates/hir-ty/src/infer/expr.rs @@ -1093,7 +1093,7 @@ impl<'db> InferenceContext<'_, 'db> { // Make sure the programmer specified correct number of fields. if matches!(adt_id, AdtId::UnionId(_)) && hir_fields.len() != 1 { - self.push_diagnostic(InferenceDiagnostic::UnionMustHaveExactlyOneField { expr }); + self.push_diagnostic(InferenceDiagnostic::UnionExprMustHaveExactlyOneField { expr }); } match base_expr { diff --git a/crates/hir/src/diagnostics.rs b/crates/hir/src/diagnostics.rs index d73050d71c..082c29c174 100644 --- a/crates/hir/src/diagnostics.rs +++ b/crates/hir/src/diagnostics.rs @@ -112,7 +112,7 @@ diagnostics![AnyDiagnostic<'db> -> MissingLifetime, ElidedLifetimesInPath, TypeMustBeKnown<'db>, - UnionMustHaveExactlyOneField, + UnionExprMustHaveExactlyOneField, ]; #[derive(Debug)] @@ -490,7 +490,7 @@ pub struct GenericDefaultRefersToSelf { } #[derive(Debug)] -pub struct UnionMustHaveExactlyOneField { +pub struct UnionExprMustHaveExactlyOneField { pub expr: InFile<ExprOrPatPtr>, } @@ -859,9 +859,9 @@ impl<'db> AnyDiagnostic<'db> { }); TypeMustBeKnown { at_point, top_term }.into() } - &InferenceDiagnostic::UnionMustHaveExactlyOneField { expr } => { + &InferenceDiagnostic::UnionExprMustHaveExactlyOneField { expr } => { let expr = expr_syntax(expr)?; - UnionMustHaveExactlyOneField { expr }.into() + UnionExprMustHaveExactlyOneField { expr }.into() } }) } diff --git a/crates/ide-diagnostics/src/handlers/union_must_have_exactly_one_field.rs b/crates/ide-diagnostics/src/handlers/union_expr_must_have_exactly_one_field.rs index e9a3b4ba4d..2569c52810 100644 --- a/crates/ide-diagnostics/src/handlers/union_must_have_exactly_one_field.rs +++ b/crates/ide-diagnostics/src/handlers/union_expr_must_have_exactly_one_field.rs @@ -1,11 +1,11 @@ use crate::{Diagnostic, DiagnosticCode, DiagnosticsContext}; -// Diagnostic: union-must-have-exactly-one-field +// Diagnostic: union-expr-must-have-exactly-one-field // // A union expression does not have exactly one field. -pub(crate) fn union_must_have_exactly_one_field( +pub(crate) fn union_expr_must_have_exactly_one_field( ctx: &DiagnosticsContext<'_>, - d: &hir::UnionMustHaveExactlyOneField, + d: &hir::UnionExprMustHaveExactlyOneField, ) -> Diagnostic { Diagnostic::new_with_syntax_node_ptr( ctx, @@ -21,7 +21,7 @@ mod tests { use crate::tests::check_diagnostics; #[test] - fn union_must_have_exactly_one_field() { + fn union_expr_must_have_exactly_one_field() { check_diagnostics( r#" union Bird { diff --git a/crates/ide-diagnostics/src/lib.rs b/crates/ide-diagnostics/src/lib.rs index aa1d2a43d5..618edc5c61 100644 --- a/crates/ide-diagnostics/src/lib.rs +++ b/crates/ide-diagnostics/src/lib.rs @@ -72,7 +72,7 @@ mod handlers { pub(crate) mod typed_hole; pub(crate) mod undeclared_label; pub(crate) mod unimplemented_builtin_macro; - pub(crate) mod union_must_have_exactly_one_field; + pub(crate) mod union_expr_must_have_exactly_one_field; pub(crate) mod unreachable_label; pub(crate) mod unresolved_assoc_item; pub(crate) mod unresolved_extern_crate; @@ -490,7 +490,7 @@ pub fn semantic_diagnostics( AnyDiagnostic::InvalidLhsOfAssignment(d) => handlers::invalid_lhs_of_assignment::invalid_lhs_of_assignment(&ctx, &d), AnyDiagnostic::TypeMustBeKnown(d) => handlers::type_must_be_known::type_must_be_known(&ctx, &d), AnyDiagnostic::PatternArgInExternFn(d) => handlers::pattern_arg_in_extern_fn::pattern_arg_in_extern_fn(&ctx, &d), - AnyDiagnostic::UnionMustHaveExactlyOneField(d) => handlers::union_must_have_exactly_one_field::union_must_have_exactly_one_field(&ctx, &d), + AnyDiagnostic::UnionExprMustHaveExactlyOneField(d) => handlers::union_expr_must_have_exactly_one_field::union_expr_must_have_exactly_one_field(&ctx, &d), }; res.push(d) } |