From fe2b5cc52ee634346bc8aecf5041b6af9fdea529 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sat, 7 Jan 2023 13:23:20 +0100
Subject: [PATCH] Removed same prio spawn

---
 macros/src/codegen/init.rs                    |  1 -
 macros/src/syntax/ast.rs                      |  4 ---
 macros/src/syntax/parse.rs                    | 32 -------------------
 macros/ui/task-interrupt-same-prio-spawn.rs   |  7 ----
 .../ui/task-interrupt-same-prio-spawn.stderr  |  5 ---
 5 files changed, 49 deletions(-)
 delete mode 100644 macros/ui/task-interrupt-same-prio-spawn.rs
 delete mode 100644 macros/ui/task-interrupt-same-prio-spawn.stderr

diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index bbde4f275f..2aa8fb31fb 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -25,7 +25,6 @@ type CodegenResult = (
 /// Generates support code for `#[init]` functions
 pub fn codegen(app: &App, analysis: &Analysis) -> CodegenResult {
     let init = &app.init;
-    let mut local_needs_lt = false;
     let name = &init.name;
 
     let mut root_init = vec![];
diff --git a/macros/src/syntax/ast.rs b/macros/src/syntax/ast.rs
index ea6e402c9a..da6016add8 100644
--- a/macros/src/syntax/ast.rs
+++ b/macros/src/syntax/ast.rs
@@ -224,9 +224,6 @@ pub struct SoftwareTaskArgs {
 
     /// Shared resources that can be accessed from this context
     pub shared_resources: SharedResources,
-
-    /// Only same priority tasks can spawn this task
-    pub only_same_priority_spawn: bool,
 }
 
 impl Default for SoftwareTaskArgs {
@@ -235,7 +232,6 @@ impl Default for SoftwareTaskArgs {
             priority: 1,
             local_resources: LocalResources::new(),
             shared_resources: SharedResources::new(),
-            only_same_priority_spawn: false,
         }
     }
 }
diff --git a/macros/src/syntax/parse.rs b/macros/src/syntax/parse.rs
index abdd677ab8..c78453a437 100644
--- a/macros/src/syntax/parse.rs
+++ b/macros/src/syntax/parse.rs
@@ -196,8 +196,6 @@ fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, Sof
         let mut shared_resources = None;
         let mut local_resources = None;
         let mut prio_span = None;
-        let mut only_same_priority_spawn = false;
-        let mut only_same_prio_span = None;
 
         let content;
         parenthesized!(content in input);
@@ -210,27 +208,6 @@ fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, Sof
             let ident: Ident = content.parse()?;
             let ident_s = ident.to_string();
 
-            if  ident_s ==  "only_same_priority_spawn_please_fix_me" {
-                if only_same_priority_spawn {
-                    return Err(parse::Error::new(
-                        ident.span(),
-                        "argument appears more than once",
-                    ));
-                }
-
-                only_same_priority_spawn = true;
-                only_same_prio_span = Some(ident.span());
-
-                if content.is_empty() {
-                    break;
-                }
-
-                // Handle comma: ,
-                let _: Token![,] = content.parse()?;
-
-                continue;
-            }
-
             // Handle equal sign
             let _: Token![=] = content.parse()?;
 
@@ -344,7 +321,6 @@ fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, Sof
                     local_resources = Some(util::parse_local_resources(&content)?);
                 }
 
-
                 _ => {
                     return Err(parse::Error::new(ident.span(), "unexpected argument"));
                 }
@@ -369,13 +345,6 @@ fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, Sof
                 ));
             }
 
-            if only_same_priority_spawn {
-                return Err(parse::Error::new(
-                    only_same_prio_span.unwrap(),
-                    "hardware tasks are not allowed to be spawned, `only_same_priority_spawn_please_fix_me` is only for software tasks",
-                ));
-            }
-
             Either::Left(HardwareTaskArgs {
                 binds,
                 priority,
@@ -387,7 +356,6 @@ fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, Sof
                 priority,
                 shared_resources,
                 local_resources,
-                only_same_priority_spawn,
             })
         })
     })
diff --git a/macros/ui/task-interrupt-same-prio-spawn.rs b/macros/ui/task-interrupt-same-prio-spawn.rs
deleted file mode 100644
index 1d5f1f8429..0000000000
--- a/macros/ui/task-interrupt-same-prio-spawn.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![no_main]
-
-#[rtic_macros::mock_app(device = mock)]
-mod app {
-    #[task(binds = SysTick, only_same_priority_spawn_please_fix_me)]
-    fn foo(_: foo::Context) {}
-}
diff --git a/macros/ui/task-interrupt-same-prio-spawn.stderr b/macros/ui/task-interrupt-same-prio-spawn.stderr
deleted file mode 100644
index 171b85064f..0000000000
--- a/macros/ui/task-interrupt-same-prio-spawn.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-error: hardware tasks are not allowed to be spawned, `only_same_priority_spawn_please_fix_me` is only for software tasks
- --> ui/task-interrupt-same-prio-spawn.rs:5:29
-  |
-5 |     #[task(binds = SysTick, only_same_priority_spawn_please_fix_me)]
-  |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^