flow-control: Rename MissingMatchArm and change its message.

commit-id:d22d6adb

Author: liorgold2

crates/cairo-lang-lowering/src/diagnostic.rs

@@ -151,22 +151,18 @@ impl<'db> MatchError<'db> {
             (MatchDiagnostic::UnsupportedMatchArmNonSequential, MatchKind::Match) => {
                 "Unsupported match - numbers must be sequential starting from 0.".into()
             }
-            (MatchDiagnostic::NonExhaustiveMatchValue, MatchKind::Match) => {
-                "Match is non exhaustive - add a wildcard pattern (`_`).".into()
-            }
             (
                 MatchDiagnostic::UnsupportedMatchArmNotALiteral
-                | MatchDiagnostic::UnsupportedMatchArmNonSequential
-                | MatchDiagnostic::NonExhaustiveMatchValue,
+                | MatchDiagnostic::UnsupportedMatchArmNonSequential,
                 MatchKind::IfLet | MatchKind::WhileLet(_, _),
             ) => unreachable!("Numeric values are not supported in if/while-let conditions."),
-            (MatchDiagnostic::MissingMatchArm(variant), MatchKind::Match) => {
-                format!("Missing match arm: `{variant}` not covered.")
+            (MatchDiagnostic::NonExhaustiveMatch(variant), MatchKind::Match) => {
+                format!("Match is non-exhaustive: `{variant}` not covered.")
             }
-            (MatchDiagnostic::MissingMatchArm(_), MatchKind::IfLet) => {
+            (MatchDiagnostic::NonExhaustiveMatch(_), MatchKind::IfLet) => {
                 unreachable!("If-let is not required to be exhaustive.")
             }
-            (MatchDiagnostic::MissingMatchArm(_), MatchKind::WhileLet(_, _)) => {
+            (MatchDiagnostic::NonExhaustiveMatch(_), MatchKind::WhileLet(_, _)) => {
                 unreachable!("While-let is not required to be exhaustive.")
             }
             (MatchDiagnostic::UnreachableMatchArm, MatchKind::Match) => {
@@ -259,10 +255,9 @@ pub enum MatchDiagnostic {
     UnsupportedMatchArmNotATuple,
 
     UnreachableMatchArm,
-    MissingMatchArm(String),
+    NonExhaustiveMatch(String),
 
     UnsupportedMatchArmNotALiteral,
     UnsupportedMatchArmNonSequential,
-    NonExhaustiveMatchValue,
     UnsupportedNumericInLetCondition,
 }

crates/cairo-lang-lowering/src/lower/flow_control/create_graph.rs

@@ -148,7 +148,7 @@ pub fn create_graph_expr_match<'db>(
                     // If no arm is available, report a non-exhaustive match error.
                     let kind = LoweringDiagnosticKind::MatchError(MatchError {
                         kind: MatchKind::Match,
-                        error: MatchDiagnostic::MissingMatchArm(path),
+                        error: MatchDiagnostic::NonExhaustiveMatch(path),
                     });
                     return graph.report_with_missing_node(expr.stable_ptr.untyped(), kind);
                 };

crates/cairo-lang-lowering/src/lower/flow_control/test_data/match

@@ -1413,7 +1413,7 @@ Root: 9
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `MyStruct{a: Some(None(_)), b: (Some(_), _, _)}` not covered.
+error: Match is non-exhaustive: `MyStruct{a: Some(None(_)), b: (Some(_), _, _)}` not covered.
  --> lib.cairo:6:5-9:5
       match x {
  _____^
@@ -1542,7 +1542,7 @@ Root: 1
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `_` not covered.
+error: Match is non-exhaustive: `_` not covered.
  --> lib.cairo:2:5
     match x {}
     ^^^^^^^^^^
@@ -1604,7 +1604,7 @@ Root: 1
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `_` not covered.
+error: Match is non-exhaustive: `_` not covered.
  --> lib.cairo:5:5
     match x {}
     ^^^^^^^^^^

crates/cairo-lang-lowering/src/lower/lower_match.rs

@@ -1843,7 +1843,7 @@ fn report_missing_arm_error<'db>(
         location.long(ctx.db).clone(),
         MatchError(MatchError {
             kind: match_type,
-            error: MatchDiagnostic::MissingMatchArm(variants_string),
+            error: MatchDiagnostic::NonExhaustiveMatch(variants_string),
         }),
     )
 }

crates/cairo-lang-lowering/src/test_data/match

@@ -257,7 +257,7 @@ foo
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `_` not covered.
+error: Match is non-exhaustive: `_` not covered.
  --> lib.cairo:3:5-6:5
       match x {
  _____^
@@ -474,7 +474,7 @@ foo
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `_` not covered.
+error: Match is non-exhaustive: `_` not covered.
  --> lib.cairo:2:5
     match Some(5) {};
     ^^^^^^^^^^^^^^^^
@@ -532,7 +532,7 @@ foo
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `_` not covered.
+error: Match is non-exhaustive: `_` not covered.
  --> lib.cairo:2:5
     match felt252_is_zero(5) {};
     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -878,7 +878,7 @@ foo
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `Some(None(_))` not covered.
+error: Match is non-exhaustive: `Some(None(_))` not covered.
  --> lib.cairo:2:5-5:5
       match a {
  _____^
@@ -918,7 +918,7 @@ enum A {
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `Three(_)` not covered.
+error: Match is non-exhaustive: `Three(_)` not covered.
  --> lib.cairo:8:5-11:5
       match a {
  _____^
@@ -1346,7 +1346,7 @@ enum A {
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `(One(_), Two(_))` not covered.
+error: Match is non-exhaustive: `(One(_), Two(_))` not covered.
  --> lib.cairo:9:5-15:5
       match (a, b) {
  _____^
@@ -2540,7 +2540,7 @@ enum A {
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `Some(None(_))` not covered.
+error: Match is non-exhaustive: `Some(None(_))` not covered.
  --> lib.cairo:7:5-12:5
       match a {
  _____^
@@ -2889,7 +2889,7 @@ type C = Result<(), ()>;
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `Ok(Ok(Ok(_)))` not covered.
+error: Match is non-exhaustive: `Ok(Ok(Ok(_)))` not covered.
  --> lib.cairo:5:5-14:5
       match a {
  _____^
@@ -2932,7 +2932,7 @@ type C = Result<(), ()>;
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `Ok(Err(_))` not covered.
+error: Match is non-exhaustive: `Ok(Err(_))` not covered.
  --> lib.cairo:5:5-14:5
       match a {
  _____^
@@ -2975,7 +2975,7 @@ type C = Result<(), ()>;
 //! > semantic_diagnostics
 
 //! > lowering_diagnostics
-error: Missing match arm: `Ok(_)` not covered.
+error: Match is non-exhaustive: `Ok(_)` not covered.
  --> lib.cairo:5:5-14:5
       match a {
  _____^