Merge #74

74: Better errors for malformed local expressions r=AfoHT a=korken89



Co-authored-by: Emil Fresk <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Better errors for malformed `local` expressions
 - Use swatinem rust-cache for GHA CI
 - Cryptic error message when writing `#[monotonic]`
 

src/parse/util.rs

@@ -201,7 +201,7 @@ pub fn parse_local_resources(content: ParseStream<'_>) -> parse::Result<LocalRes
 
                         (name, ty, cfgs, attrs)
                     }
-                    _ => return Err(parse::Error::new(e.span(), "not a type")),
+                    e => return Err(parse::Error::new(e.span(), "malformed, expected a type")),
                 };
 
                 let expr = e.right; // Expr
@@ -217,7 +217,12 @@ pub fn parse_local_resources(content: ParseStream<'_>) -> parse::Result<LocalRes
                 )
             }
 
-            _ => return err,
+            expr => {
+                return Err(parse::Error::new(
+                    expr.span(),
+                    "malformed, exptected 'IDENT: TYPE = EXPR'",
+                ))
+            }
         };
 
         resources.insert(name, local);

ui/local-malformed-1.rs

@@ -0,0 +1,16 @@
+#![no_main]
+
+#[mock::app]
+mod app {
+    #[shared]
+    struct Shared {}
+
+    #[local]
+    struct Local {}
+
+    #[task(local = [a:])]
+    fn foo(_: foo::Context) {}
+
+    #[init]
+    fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {}
+}

ui/local-malformed-1.stderr

@@ -0,0 +1,5 @@
+error: unexpected end of input, expected one of: `for`, parentheses, `fn`, `unsafe`, `extern`, identifier, `::`, `<`, square brackets, `*`, `&`, `!`, `impl`, `_`, lifetime
+  --> ui/local-malformed-1.rs:11:23
+   |
+11 |     #[task(local = [a:])]
+   |                       ^

ui/local-malformed-2.rs

@@ -0,0 +1,16 @@
+#![no_main]
+
+#[mock::app]
+mod app {
+    #[shared]
+    struct Shared {}
+
+    #[local]
+    struct Local {}
+
+    #[task(local = [a: u32])]
+    fn foo(_: foo::Context) {}
+
+    #[init]
+    fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {}
+}

ui/local-malformed-2.stderr

@@ -0,0 +1,5 @@
+error: malformed, exptected 'IDENT: TYPE = EXPR'
+  --> ui/local-malformed-2.rs:11:21
+   |
+11 |     #[task(local = [a: u32])]
+   |                     ^

ui/local-malformed-3.rs

@@ -0,0 +1,16 @@
+#![no_main]
+
+#[mock::app]
+mod app {
+    #[shared]
+    struct Shared {}
+
+    #[local]
+    struct Local {}
+
+    #[task(local = [a: u32 =])]
+    fn foo(_: foo::Context) {}
+
+    #[init]
+    fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {}
+}

ui/local-malformed-3.stderr

@@ -0,0 +1,5 @@
+error: unexpected end of input, expected expression
+  --> ui/local-malformed-3.rs:11:29
+   |
+11 |     #[task(local = [a: u32 =])]
+   |                             ^

ui/local-malformed-4.rs

@@ -0,0 +1,16 @@
+#![no_main]
+
+#[mock::app]
+mod app {
+    #[shared]
+    struct Shared {}
+
+    #[local]
+    struct Local {}
+
+    #[task(local = [a = u32])]
+    fn foo(_: foo::Context) {}
+
+    #[init]
+    fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {}
+}

ui/local-malformed-4.stderr

@@ -0,0 +1,5 @@
+error: malformed, expected a type
+  --> ui/local-malformed-4.rs:11:21
+   |
+11 |     #[task(local = [a = u32])]
+   |                     ^