fix tests

Signed-off-by: Jean Mertz <git@jeanmertz.com>
vectordotdev · Mar 26, 2021 · 6417766 · 6417766
1 parent f4c6c5c
commit 6417766
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/docs/reference/remap.cue b/docs/reference/remap.cue
@@ -214,13 +214,13 @@ remap: #Remap & {
 				"""
 		},
 		{
-			title: "Unhandled error"
+			title: "Unhandled fallible assignment"
 			input: log: message: "key1=value1 key2=value2"
 			source: """
 				structured = parse_key_value(.message)
 				"""
 			raises: compiletime: """
-				error[E103]: unhandled error
+				error[E103]: unhandled fallible assignment
 				  ┌─ :1:14
 				  │
 				1 │ structured = parse_key_value(.message)

diff --git a/docs/reference/remap/errors/103_unhandled_assignment_runtime_error.cue b/docs/reference/remap/errors/103_unhandled_assignment_runtime_error.cue
@@ -1,7 +1,7 @@
 package metadata
 
 remap: errors: "103": {
-	title:       "Unhandled error"
+	title:       "Unhandled fallible assignment"
 	description: """
 		The right-hand side of this [assignment](\(urls.vrl_expressions)#\(remap.literals.regular_expression.anchor))
 		is fallible (that is, it can produce a [runtime error](\(urls.vrl_runtime_errors))), but the error isn't
@@ -17,30 +17,30 @@ remap: errors: "103": {
 	examples: [...{
 		input: log: message: "key=value"
 		source: #"""
-			. |= parse_key_value(.message)
+			. = parse_key_value(.message)
 			"""#
 	}]
 
 	examples: [
 		{
 			"title": "\(title) (coalescing)"
 			diff: #"""
-				-. |= parse_key_value(.message)
-				+. |= parse_key_value(.message) ?? {}
+				-. = parse_key_value(.message)
+				+. = parse_key_value(.message) ?? {}
 				"""#
 		},
 		{
 			"title": "\(title) (raising)"
 			diff: #"""
-				-. |= parse_key_value(.message)
-				+. |= parse_key_value!(.message)
+				-. = parse_key_value(.message)
+				+. = parse_key_value!(.message)
 				"""#
 		},
 		{
 			"title": "\(title) (assigning)"
 			diff: #"""
-				-. |= parse_key_value(.message)
-				+., err |= parse_key_value(.message)
+				-. = parse_key_value(.message)
+				+., err = parse_key_value(.message)
 				"""#
 		},
 	]

diff --git a/lib/vrl/compiler/src/expression/assignment.rs b/lib/vrl/compiler/src/expression/assignment.rs
@@ -30,7 +30,10 @@ impl Assignment {
                 // Fallible expressions require infallible assignment.
                 if type_def.is_fallible() {
                     return Err(Error {
-                        variant: ErrorVariant::UnhandledError(target.to_string(), expr.to_string()),
+                        variant: ErrorVariant::FallibleAssignment(
+                            target.to_string(),
+                            expr.to_string(),
+                        ),
                         span,
                         expr_span,
                         assignment_span,
@@ -444,8 +447,8 @@ pub enum ErrorVariant {
     #[error("unnecessary no-op assignment")]
     UnnecessaryNoop(Span),
 
-    #[error("unhandled error")]
-    UnhandledError(String, String),
+    #[error("unhandled fallible assignment")]
+    FallibleAssignment(String, String),
 
     #[error("unnecessary error assignment")]
     InfallibleAssignment(String, String, Span, Span),
@@ -472,7 +475,7 @@ impl DiagnosticError for Error {
 
         match &self.variant {
             UnnecessaryNoop(..) => 640,
-            UnhandledError(..) => 103,
+            FallibleAssignment(..) => 103,
             InfallibleAssignment(..) => 104,
             InvalidTarget(..) => 641,
         }
@@ -487,7 +490,7 @@ impl DiagnosticError for Error {
                 Label::context("either assign to a path or variable here", *target_span),
                 Label::context("or remove the assignment", self.assignment_span),
             ],
-            UnhandledError(target, expr) => vec![
+            FallibleAssignment(target, expr) => vec![
                 Label::primary("this expression is fallible", self.expr_span),
                 Label::context("update the expression to be infallible", self.expr_span),
                 Label::context(
@@ -512,7 +515,7 @@ impl DiagnosticError for Error {
         use ErrorVariant::*;
 
         match &self.variant {
-            UnhandledError(..) | InfallibleAssignment(..) => vec![Note::SeeErrorDocs],
+            FallibleAssignment(..) | InfallibleAssignment(..) => vec![Note::SeeErrorDocs],
             _ => vec![],
         }
     }

diff --git a/lib/vrl/tests/tests/diagnostics/unhandled_parse_regex_all_type.vrl b/lib/vrl/tests/tests/diagnostics/unhandled_parse_regex_all_type.vrl
@@ -1,7 +1,7 @@
 # object: { "message": "bananas and another ant" }
 # result:
 #
-# error[E103]: unhandled error
+# error[E103]: unhandled fallible assignment
 #   ┌─ :3:6
 #   │
 # 3 │ .a = sha3(.result[0].an)