134 files changed, 31 insertions, 29 deletions

diff --git a/rtic/.cargo/config.toml b/.cargo/config.toml
index d70faef..d70faef 100644
--- a/rtic/.cargo/config.toml
+++ b/.cargo/config.toml
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..820d4aa
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,28 @@
+[workspace]
+members = [
+    "rtic",
+    "xtask",
+]
+
+[profile.release]
+codegen-units = 1
+lto = true
+
+# do not optimize proc-macro deps or build scripts
+[profile.dev.build-override]
+codegen-units = 16
+debug = false
+debug-assertions = false
+opt-level = 0
+overflow-checks = false
+
+
+[profile.release.build-override]
+codegen-units = 16
+debug = false
+debug-assertions = false
+opt-level = 0
+overflow-checks = false
+
+[patch.crates-io]
+lm3s6965 = { git = "https://github.com/japaric/lm3s6965" }
diff --git a/rtic/macros/.gitignore b/rtic-macros/.gitignore
index 4fffb2f..4fffb2f 100644
--- a/rtic/macros/.gitignore
+++ b/rtic-macros/.gitignore
diff --git a/rtic/macros/Cargo.toml b/rtic-macros/Cargo.toml
index 970f666..970f666 100644
--- a/rtic/macros/Cargo.toml
+++ b/rtic-macros/Cargo.toml
diff --git a/rtic/macros/src/analyze.rs b/rtic-macros/src/analyze.rs
index 65774f6..65774f6 100644
--- a/rtic/macros/src/analyze.rs
+++ b/rtic-macros/src/analyze.rs
diff --git a/rtic/macros/src/bindings.rs b/rtic-macros/src/bindings.rs
index 8b13789..8b13789 100644
--- a/rtic/macros/src/bindings.rs
+++ b/rtic-macros/src/bindings.rs
diff --git a/rtic/macros/src/check.rs b/rtic-macros/src/check.rs
index a05c82e..a05c82e 100644
--- a/rtic/macros/src/check.rs
+++ b/rtic-macros/src/check.rs
diff --git a/rtic/macros/src/codegen.rs b/rtic-macros/src/codegen.rs
index 24e98ce..24e98ce 100644
--- a/rtic/macros/src/codegen.rs
+++ b/rtic-macros/src/codegen.rs
diff --git a/rtic/macros/src/codegen/assertions.rs b/rtic-macros/src/codegen/assertions.rs
index dd94aa6..dd94aa6 100644
--- a/rtic/macros/src/codegen/assertions.rs
+++ b/rtic-macros/src/codegen/assertions.rs
diff --git a/rtic/macros/src/codegen/async_dispatchers.rs b/rtic-macros/src/codegen/async_dispatchers.rs
index a12ad32..a12ad32 100644
--- a/rtic/macros/src/codegen/async_dispatchers.rs
+++ b/rtic-macros/src/codegen/async_dispatchers.rs
diff --git a/rtic/macros/src/codegen/hardware_tasks.rs b/rtic-macros/src/codegen/hardware_tasks.rs
index 8a5a8f6..8a5a8f6 100644
--- a/rtic/macros/src/codegen/hardware_tasks.rs
+++ b/rtic-macros/src/codegen/hardware_tasks.rs
diff --git a/rtic/macros/src/codegen/idle.rs b/rtic-macros/src/codegen/idle.rs
index 0c833ef..0c833ef 100644
--- a/rtic/macros/src/codegen/idle.rs
+++ b/rtic-macros/src/codegen/idle.rs
diff --git a/rtic/macros/src/codegen/init.rs b/rtic-macros/src/codegen/init.rs
index 6e1059f..6e1059f 100644
--- a/rtic/macros/src/codegen/init.rs
+++ b/rtic-macros/src/codegen/init.rs
diff --git a/rtic/macros/src/codegen/local_resources.rs b/rtic-macros/src/codegen/local_resources.rs
index e6d1553..e6d1553 100644
--- a/rtic/macros/src/codegen/local_resources.rs
+++ b/rtic-macros/src/codegen/local_resources.rs
diff --git a/rtic/macros/src/codegen/local_resources_struct.rs b/rtic-macros/src/codegen/local_resources_struct.rs
index 100c3eb..100c3eb 100644
--- a/rtic/macros/src/codegen/local_resources_struct.rs
+++ b/rtic-macros/src/codegen/local_resources_struct.rs
diff --git a/rtic/macros/src/codegen/main.rs b/rtic-macros/src/codegen/main.rs
index 2775d25..2775d25 100644
--- a/rtic/macros/src/codegen/main.rs
+++ b/rtic-macros/src/codegen/main.rs
diff --git a/rtic/macros/src/codegen/module.rs b/rtic-macros/src/codegen/module.rs
index 8b3fca2..8b3fca2 100644
--- a/rtic/macros/src/codegen/module.rs
+++ b/rtic-macros/src/codegen/module.rs
diff --git a/rtic/macros/src/codegen/post_init.rs b/rtic-macros/src/codegen/post_init.rs
index c4e5383..c4e5383 100644
--- a/rtic/macros/src/codegen/post_init.rs
+++ b/rtic-macros/src/codegen/post_init.rs
diff --git a/rtic/macros/src/codegen/pre_init.rs b/rtic-macros/src/codegen/pre_init.rs
index 28ba29c..28ba29c 100644
--- a/rtic/macros/src/codegen/pre_init.rs
+++ b/rtic-macros/src/codegen/pre_init.rs
diff --git a/rtic/macros/src/codegen/shared_resources.rs b/rtic-macros/src/codegen/shared_resources.rs
index 19fd13f..19fd13f 100644
--- a/rtic/macros/src/codegen/shared_resources.rs
+++ b/rtic-macros/src/codegen/shared_resources.rs
diff --git a/rtic/macros/src/codegen/shared_resources_struct.rs b/rtic-macros/src/codegen/shared_resources_struct.rs
index fa6f0fc..fa6f0fc 100644
--- a/rtic/macros/src/codegen/shared_resources_struct.rs
+++ b/rtic-macros/src/codegen/shared_resources_struct.rs
diff --git a/rtic/macros/src/codegen/software_tasks.rs b/rtic-macros/src/codegen/software_tasks.rs
index 34fc851..34fc851 100644
--- a/rtic/macros/src/codegen/software_tasks.rs
+++ b/rtic-macros/src/codegen/software_tasks.rs
diff --git a/rtic/macros/src/codegen/util.rs b/rtic-macros/src/codegen/util.rs
index d0c8cc0..d0c8cc0 100644
--- a/rtic/macros/src/codegen/util.rs
+++ b/rtic-macros/src/codegen/util.rs
diff --git a/rtic/macros/src/lib.rs b/rtic-macros/src/lib.rs
index 3ac2701..3ac2701 100644
--- a/rtic/macros/src/lib.rs
+++ b/rtic-macros/src/lib.rs
diff --git a/rtic/macros/src/syntax.rs b/rtic-macros/src/syntax.rs
index d6f5a47..d6f5a47 100644
--- a/rtic/macros/src/syntax.rs
+++ b/rtic-macros/src/syntax.rs
diff --git a/rtic/macros/src/syntax/.travis.yml b/rtic-macros/src/syntax/.travis.yml
index 52d1ffd..52d1ffd 100644
--- a/rtic/macros/src/syntax/.travis.yml
+++ b/rtic-macros/src/syntax/.travis.yml
diff --git a/rtic/macros/src/syntax/accessors.rs b/rtic-macros/src/syntax/accessors.rs
index e75dde6..e75dde6 100644
--- a/rtic/macros/src/syntax/accessors.rs
+++ b/rtic-macros/src/syntax/accessors.rs
diff --git a/rtic/macros/src/syntax/analyze.rs b/rtic-macros/src/syntax/analyze.rs
index 57f9f2c..57f9f2c 100644
--- a/rtic/macros/src/syntax/analyze.rs
+++ b/rtic-macros/src/syntax/analyze.rs
diff --git a/rtic/macros/src/syntax/ast.rs b/rtic-macros/src/syntax/ast.rs
index 27e6773..27e6773 100644
--- a/rtic/macros/src/syntax/ast.rs
+++ b/rtic-macros/src/syntax/ast.rs
diff --git a/rtic/macros/src/syntax/check.rs b/rtic-macros/src/syntax/check.rs
index 989d418..989d418 100644
--- a/rtic/macros/src/syntax/check.rs
+++ b/rtic-macros/src/syntax/check.rs
diff --git a/rtic/macros/src/syntax/optimize.rs b/rtic-macros/src/syntax/optimize.rs
index e83ba31..e83ba31 100644
--- a/rtic/macros/src/syntax/optimize.rs
+++ b/rtic-macros/src/syntax/optimize.rs
diff --git a/rtic/macros/src/syntax/parse.rs b/rtic-macros/src/syntax/parse.rs
index 72eeeaf..72eeeaf 100644
--- a/rtic/macros/src/syntax/parse.rs
+++ b/rtic-macros/src/syntax/parse.rs
diff --git a/rtic/macros/src/syntax/parse/app.rs b/rtic-macros/src/syntax/parse/app.rs
index e797f75..e797f75 100644
--- a/rtic/macros/src/syntax/parse/app.rs
+++ b/rtic-macros/src/syntax/parse/app.rs
diff --git a/rtic/macros/src/syntax/parse/hardware_task.rs b/rtic-macros/src/syntax/parse/hardware_task.rs
index 7f6dfbe..7f6dfbe 100644
--- a/rtic/macros/src/syntax/parse/hardware_task.rs
+++ b/rtic-macros/src/syntax/parse/hardware_task.rs
diff --git a/rtic/macros/src/syntax/parse/idle.rs b/rtic-macros/src/syntax/parse/idle.rs
index 124c136..124c136 100644
--- a/rtic/macros/src/syntax/parse/idle.rs
+++ b/rtic-macros/src/syntax/parse/idle.rs
diff --git a/rtic/macros/src/syntax/parse/init.rs b/rtic-macros/src/syntax/parse/init.rs
index 0aea20b..0aea20b 100644
--- a/rtic/macros/src/syntax/parse/init.rs
+++ b/rtic-macros/src/syntax/parse/init.rs
diff --git a/rtic/macros/src/syntax/parse/resource.rs b/rtic-macros/src/syntax/parse/resource.rs
index ff10057..ff10057 100644
--- a/rtic/macros/src/syntax/parse/resource.rs
+++ b/rtic-macros/src/syntax/parse/resource.rs
diff --git a/rtic/macros/src/syntax/parse/software_task.rs b/rtic-macros/src/syntax/parse/software_task.rs
index 769aa65..769aa65 100644
--- a/rtic/macros/src/syntax/parse/software_task.rs
+++ b/rtic-macros/src/syntax/parse/software_task.rs
diff --git a/rtic/macros/src/syntax/parse/util.rs b/rtic-macros/src/syntax/parse/util.rs
index 5a5e0c0..5a5e0c0 100644
--- a/rtic/macros/src/syntax/parse/util.rs
+++ b/rtic-macros/src/syntax/parse/util.rs
diff --git a/rtic/macros/tests/ui.rs b/rtic-macros/tests/ui.rs
index 9fb88a1..9fb88a1 100644
--- a/rtic/macros/tests/ui.rs
+++ b/rtic-macros/tests/ui.rs
diff --git a/rtic/macros/ui/extern-interrupt-used.rs b/rtic-macros/ui/extern-interrupt-used.rs
index 6346a7d..6346a7d 100644
--- a/rtic/macros/ui/extern-interrupt-used.rs
+++ b/rtic-macros/ui/extern-interrupt-used.rs
diff --git a/rtic/macros/ui/extern-interrupt-used.stderr b/rtic-macros/ui/extern-interrupt-used.stderr
index 970d39b..970d39b 100644
--- a/rtic/macros/ui/extern-interrupt-used.stderr
+++ b/rtic-macros/ui/extern-interrupt-used.stderr
diff --git a/rtic/macros/ui/idle-double-local.rs b/rtic-macros/ui/idle-double-local.rs
index 54e67d3..54e67d3 100644
--- a/rtic/macros/ui/idle-double-local.rs
+++ b/rtic-macros/ui/idle-double-local.rs
diff --git a/rtic/macros/ui/idle-double-local.stderr b/rtic-macros/ui/idle-double-local.stderr
index b558136..b558136 100644
--- a/rtic/macros/ui/idle-double-local.stderr
+++ b/rtic-macros/ui/idle-double-local.stderr
diff --git a/rtic/macros/ui/idle-double-shared.rs b/rtic-macros/ui/idle-double-shared.rs
index f66cb93..f66cb93 100644
--- a/rtic/macros/ui/idle-double-shared.rs
+++ b/rtic-macros/ui/idle-double-shared.rs
diff --git a/rtic/macros/ui/idle-double-shared.stderr b/rtic-macros/ui/idle-double-shared.stderr
index 6f62ad2..6f62ad2 100644
--- a/rtic/macros/ui/idle-double-shared.stderr
+++ b/rtic-macros/ui/idle-double-shared.stderr
diff --git a/rtic/macros/ui/idle-input.rs b/rtic-macros/ui/idle-input.rs
index c896b1c..c896b1c 100644
--- a/rtic/macros/ui/idle-input.rs
+++ b/rtic-macros/ui/idle-input.rs
diff --git a/rtic/macros/ui/idle-input.stderr b/rtic-macros/ui/idle-input.stderr
index 34c38fc..34c38fc 100644
--- a/rtic/macros/ui/idle-input.stderr
+++ b/rtic-macros/ui/idle-input.stderr
diff --git a/rtic/macros/ui/idle-no-context.rs b/rtic-macros/ui/idle-no-context.rs
index bab4680..bab4680 100644
--- a/rtic/macros/ui/idle-no-context.rs
+++ b/rtic-macros/ui/idle-no-context.rs
diff --git a/rtic/macros/ui/idle-no-context.stderr b/rtic-macros/ui/idle-no-context.stderr
index c9f4b3d..c9f4b3d 100644
--- a/rtic/macros/ui/idle-no-context.stderr
+++ b/rtic-macros/ui/idle-no-context.stderr
diff --git a/rtic/macros/ui/idle-not-divergent.rs b/rtic-macros/ui/idle-not-divergent.rs
index d1ae8b1..d1ae8b1 100644
--- a/rtic/macros/ui/idle-not-divergent.rs
+++ b/rtic-macros/ui/idle-not-divergent.rs
diff --git a/rtic/macros/ui/idle-not-divergent.stderr b/rtic-macros/ui/idle-not-divergent.stderr
index e318f58..e318f58 100644
--- a/rtic/macros/ui/idle-not-divergent.stderr
+++ b/rtic-macros/ui/idle-not-divergent.stderr
diff --git a/rtic/macros/ui/idle-output.rs b/rtic-macros/ui/idle-output.rs
index 1662157..1662157 100644
--- a/rtic/macros/ui/idle-output.rs
+++ b/rtic-macros/ui/idle-output.rs
diff --git a/rtic/macros/ui/idle-output.stderr b/rtic-macros/ui/idle-output.stderr
index 7070e25..7070e25 100644
--- a/rtic/macros/ui/idle-output.stderr
+++ b/rtic-macros/ui/idle-output.stderr
diff --git a/rtic/macros/ui/idle-pub.rs b/rtic-macros/ui/idle-pub.rs
index 0d8dd01..0d8dd01 100644
--- a/rtic/macros/ui/idle-pub.rs
+++ b/rtic-macros/ui/idle-pub.rs
diff --git a/rtic/macros/ui/idle-pub.stderr b/rtic-macros/ui/idle-pub.stderr
index aa46ac3..aa46ac3 100644
--- a/rtic/macros/ui/idle-pub.stderr
+++ b/rtic-macros/ui/idle-pub.stderr
diff --git a/rtic/macros/ui/idle-unsafe.rs b/rtic-macros/ui/idle-unsafe.rs
index 3422ef2..3422ef2 100644
--- a/rtic/macros/ui/idle-unsafe.rs
+++ b/rtic-macros/ui/idle-unsafe.rs
diff --git a/rtic/macros/ui/idle-unsafe.stderr b/rtic-macros/ui/idle-unsafe.stderr
index a416800..a416800 100644
--- a/rtic/macros/ui/idle-unsafe.stderr
+++ b/rtic-macros/ui/idle-unsafe.stderr
diff --git a/rtic/macros/ui/init-divergent.rs b/rtic-macros/ui/init-divergent.rs
index 5e4e96a..5e4e96a 100644
--- a/rtic/macros/ui/init-divergent.rs
+++ b/rtic-macros/ui/init-divergent.rs
diff --git a/rtic/macros/ui/init-divergent.stderr b/rtic-macros/ui/init-divergent.stderr
index 9f6acf6..9f6acf6 100644
--- a/rtic/macros/ui/init-divergent.stderr
+++ b/rtic-macros/ui/init-divergent.stderr
diff --git a/rtic/macros/ui/init-double-local.rs b/rtic-macros/ui/init-double-local.rs
index 5f6d7ac..5f6d7ac 100644
--- a/rtic/macros/ui/init-double-local.rs
+++ b/rtic-macros/ui/init-double-local.rs
diff --git a/rtic/macros/ui/init-double-local.stderr b/rtic-macros/ui/init-double-local.stderr
index 07c3b50..07c3b50 100644
--- a/rtic/macros/ui/init-double-local.stderr
+++ b/rtic-macros/ui/init-double-local.stderr
diff --git a/rtic/macros/ui/init-double-shared.rs b/rtic-macros/ui/init-double-shared.rs
index 4503c87..4503c87 100644
--- a/rtic/macros/ui/init-double-shared.rs
+++ b/rtic-macros/ui/init-double-shared.rs
diff --git a/rtic/macros/ui/init-double-shared.stderr b/rtic-macros/ui/init-double-shared.stderr
index af2a97b..af2a97b 100644
--- a/rtic/macros/ui/init-double-shared.stderr
+++ b/rtic-macros/ui/init-double-shared.stderr
diff --git a/rtic/macros/ui/init-input.rs b/rtic-macros/ui/init-input.rs
index d41a503..d41a503 100644
--- a/rtic/macros/ui/init-input.rs
+++ b/rtic-macros/ui/init-input.rs
diff --git a/rtic/macros/ui/init-input.stderr b/rtic-macros/ui/init-input.stderr
index e236043..e236043 100644
--- a/rtic/macros/ui/init-input.stderr
+++ b/rtic-macros/ui/init-input.stderr
diff --git a/rtic/macros/ui/init-no-context.rs b/rtic-macros/ui/init-no-context.rs
index cdce4c5..cdce4c5 100644
--- a/rtic/macros/ui/init-no-context.rs
+++ b/rtic-macros/ui/init-no-context.rs
diff --git a/rtic/macros/ui/init-no-context.stderr b/rtic-macros/ui/init-no-context.stderr
index 28e1fd4..28e1fd4 100644
--- a/rtic/macros/ui/init-no-context.stderr
+++ b/rtic-macros/ui/init-no-context.stderr
diff --git a/rtic/macros/ui/init-output.rs b/rtic-macros/ui/init-output.rs
index 7057c95..7057c95 100644
--- a/rtic/macros/ui/init-output.rs
+++ b/rtic-macros/ui/init-output.rs
diff --git a/rtic/macros/ui/init-output.stderr b/rtic-macros/ui/init-output.stderr
index 8bc3c83..8bc3c83 100644
--- a/rtic/macros/ui/init-output.stderr
+++ b/rtic-macros/ui/init-output.stderr
diff --git a/rtic/macros/ui/init-pub.rs b/rtic-macros/ui/init-pub.rs
index dd59aa1..dd59aa1 100644
--- a/rtic/macros/ui/init-pub.rs
+++ b/rtic-macros/ui/init-pub.rs
diff --git a/rtic/macros/ui/init-pub.stderr b/rtic-macros/ui/init-pub.stderr
index b1610ed..b1610ed 100644
--- a/rtic/macros/ui/init-pub.stderr
+++ b/rtic-macros/ui/init-pub.stderr
diff --git a/rtic/macros/ui/init-unsafe.rs b/rtic-macros/ui/init-unsafe.rs
index 4f89baf..4f89baf 100644
--- a/rtic/macros/ui/init-unsafe.rs
+++ b/rtic-macros/ui/init-unsafe.rs
diff --git a/rtic/macros/ui/init-unsafe.stderr b/rtic-macros/ui/init-unsafe.stderr
index fd0b8f3..fd0b8f3 100644
--- a/rtic/macros/ui/init-unsafe.stderr
+++ b/rtic-macros/ui/init-unsafe.stderr
diff --git a/rtic/macros/ui/interrupt-double.rs b/rtic-macros/ui/interrupt-double.rs
index e2addc7..e2addc7 100644
--- a/rtic/macros/ui/interrupt-double.rs
+++ b/rtic-macros/ui/interrupt-double.rs
diff --git a/rtic/macros/ui/interrupt-double.stderr b/rtic-macros/ui/interrupt-double.stderr
index 8db34e2..8db34e2 100644
--- a/rtic/macros/ui/interrupt-double.stderr
+++ b/rtic-macros/ui/interrupt-double.stderr
diff --git a/rtic/macros/ui/local-collision-2.rs b/rtic-macros/ui/local-collision-2.rs
index 08bc8e5..08bc8e5 100644
--- a/rtic/macros/ui/local-collision-2.rs
+++ b/rtic-macros/ui/local-collision-2.rs
diff --git a/rtic/macros/ui/local-collision-2.stderr b/rtic-macros/ui/local-collision-2.stderr
index 47dbbe3..47dbbe3 100644
--- a/rtic/macros/ui/local-collision-2.stderr
+++ b/rtic-macros/ui/local-collision-2.stderr
diff --git a/rtic/macros/ui/local-collision.rs b/rtic-macros/ui/local-collision.rs
index 0e4eef7..0e4eef7 100644
--- a/rtic/macros/ui/local-collision.rs
+++ b/rtic-macros/ui/local-collision.rs
diff --git a/rtic/macros/ui/local-collision.stderr b/rtic-macros/ui/local-collision.stderr
index 47fbb6e..47fbb6e 100644
--- a/rtic/macros/ui/local-collision.stderr
+++ b/rtic-macros/ui/local-collision.stderr
diff --git a/rtic/macros/ui/local-malformed-1.rs b/rtic-macros/ui/local-malformed-1.rs
index 219eef5..219eef5 100644
--- a/rtic/macros/ui/local-malformed-1.rs
+++ b/rtic-macros/ui/local-malformed-1.rs
diff --git a/rtic/macros/ui/local-malformed-1.stderr b/rtic-macros/ui/local-malformed-1.stderr
index d15c324..d15c324 100644
--- a/rtic/macros/ui/local-malformed-1.stderr
+++ b/rtic-macros/ui/local-malformed-1.stderr
diff --git a/rtic/macros/ui/local-malformed-2.rs b/rtic-macros/ui/local-malformed-2.rs
index d691453..d691453 100644
--- a/rtic/macros/ui/local-malformed-2.rs
+++ b/rtic-macros/ui/local-malformed-2.rs
diff --git a/rtic/macros/ui/local-malformed-2.stderr b/rtic-macros/ui/local-malformed-2.stderr
index 0b448f0..0b448f0 100644
--- a/rtic/macros/ui/local-malformed-2.stderr
+++ b/rtic-macros/ui/local-malformed-2.stderr
diff --git a/rtic/macros/ui/local-malformed-3.rs b/rtic-macros/ui/local-malformed-3.rs
index 7eddfa4..7eddfa4 100644
--- a/rtic/macros/ui/local-malformed-3.rs
+++ b/rtic-macros/ui/local-malformed-3.rs
diff --git a/rtic/macros/ui/local-malformed-3.stderr b/rtic-macros/ui/local-malformed-3.stderr
index 61af4f3..61af4f3 100644
--- a/rtic/macros/ui/local-malformed-3.stderr
+++ b/rtic-macros/ui/local-malformed-3.stderr
diff --git a/rtic/macros/ui/local-malformed-4.rs b/rtic-macros/ui/local-malformed-4.rs
index b913947..b913947 100644
--- a/rtic/macros/ui/local-malformed-4.rs
+++ b/rtic-macros/ui/local-malformed-4.rs
diff --git a/rtic/macros/ui/local-malformed-4.stderr b/rtic-macros/ui/local-malformed-4.stderr
index 0f7d9e7..0f7d9e7 100644
--- a/rtic/macros/ui/local-malformed-4.stderr
+++ b/rtic-macros/ui/local-malformed-4.stderr
diff --git a/rtic/macros/ui/local-not-declared.rs b/rtic-macros/ui/local-not-declared.rs
index 7c087e4..7c087e4 100644
--- a/rtic/macros/ui/local-not-declared.rs
+++ b/rtic-macros/ui/local-not-declared.rs
diff --git a/rtic/macros/ui/local-not-declared.stderr b/rtic-macros/ui/local-not-declared.stderr
index 10d4b04..10d4b04 100644
--- a/rtic/macros/ui/local-not-declared.stderr
+++ b/rtic-macros/ui/local-not-declared.stderr
diff --git a/rtic/macros/ui/local-pub.rs b/rtic-macros/ui/local-pub.rs
index 42da4f4..42da4f4 100644
--- a/rtic/macros/ui/local-pub.rs
+++ b/rtic-macros/ui/local-pub.rs
diff --git a/rtic/macros/ui/local-pub.stderr b/rtic-macros/ui/local-pub.stderr
index e4814ca..e4814ca 100644
--- a/rtic/macros/ui/local-pub.stderr
+++ b/rtic-macros/ui/local-pub.stderr
diff --git a/rtic/macros/ui/local-shared-attribute.rs b/rtic-macros/ui/local-shared-attribute.rs
index c594b5f..c594b5f 100644
--- a/rtic/macros/ui/local-shared-attribute.rs
+++ b/rtic-macros/ui/local-shared-attribute.rs
diff --git a/rtic/macros/ui/local-shared-attribute.stderr b/rtic-macros/ui/local-shared-attribute.stderr
index a8130e8..a8130e8 100644
--- a/rtic/macros/ui/local-shared-attribute.stderr
+++ b/rtic-macros/ui/local-shared-attribute.stderr
diff --git a/rtic/macros/ui/local-shared.rs b/rtic-macros/ui/local-shared.rs
index 4e8f9f4..4e8f9f4 100644
--- a/rtic/macros/ui/local-shared.rs
+++ b/rtic-macros/ui/local-shared.rs
diff --git a/rtic/macros/ui/local-shared.stderr b/rtic-macros/ui/local-shared.stderr
index fceb763..fceb763 100644
--- a/rtic/macros/ui/local-shared.stderr
+++ b/rtic-macros/ui/local-shared.stderr
diff --git a/rtic/macros/ui/shared-lock-free.rs b/rtic-macros/ui/shared-lock-free.rs
index b3a4b9c..b3a4b9c 100644
--- a/rtic/macros/ui/shared-lock-free.rs
+++ b/rtic-macros/ui/shared-lock-free.rs
diff --git a/rtic/macros/ui/shared-lock-free.stderr b/rtic-macros/ui/shared-lock-free.stderr
index 51e99a0..51e99a0 100644
--- a/rtic/macros/ui/shared-lock-free.stderr
+++ b/rtic-macros/ui/shared-lock-free.stderr
diff --git a/rtic/macros/ui/shared-not-declared.rs b/rtic-macros/ui/shared-not-declared.rs
index 5fef534..5fef534 100644
--- a/rtic/macros/ui/shared-not-declared.rs
+++ b/rtic-macros/ui/shared-not-declared.rs
diff --git a/rtic/macros/ui/shared-not-declared.stderr b/rtic-macros/ui/shared-not-declared.stderr
index 7c5fb32..7c5fb32 100644
--- a/rtic/macros/ui/shared-not-declared.stderr
+++ b/rtic-macros/ui/shared-not-declared.stderr
diff --git a/rtic/macros/ui/shared-pub.rs b/rtic-macros/ui/shared-pub.rs
index 10351fd..10351fd 100644
--- a/rtic/macros/ui/shared-pub.rs
+++ b/rtic-macros/ui/shared-pub.rs
diff --git a/rtic/macros/ui/shared-pub.stderr b/rtic-macros/ui/shared-pub.stderr
index 7148893..7148893 100644
--- a/rtic/macros/ui/shared-pub.stderr
+++ b/rtic-macros/ui/shared-pub.stderr
diff --git a/rtic/macros/ui/task-divergent.rs b/rtic-macros/ui/task-divergent.rs
index ffe2dc0..ffe2dc0 100644
--- a/rtic/macros/ui/task-divergent.rs
+++ b/rtic-macros/ui/task-divergent.rs
diff --git a/rtic/macros/ui/task-divergent.stderr b/rtic-macros/ui/task-divergent.stderr
index dd00208..dd00208 100644
--- a/rtic/macros/ui/task-divergent.stderr
+++ b/rtic-macros/ui/task-divergent.stderr
diff --git a/rtic/macros/ui/task-double-local.rs b/rtic-macros/ui/task-double-local.rs
index c5277e2..c5277e2 100644
--- a/rtic/macros/ui/task-double-local.rs
+++ b/rtic-macros/ui/task-double-local.rs
diff --git a/rtic/macros/ui/task-double-local.stderr b/rtic-macros/ui/task-double-local.stderr
index 91ed844..91ed844 100644
--- a/rtic/macros/ui/task-double-local.stderr
+++ b/rtic-macros/ui/task-double-local.stderr
diff --git a/rtic/macros/ui/task-double-priority.rs b/rtic-macros/ui/task-double-priority.rs
index 5c8bd5b..5c8bd5b 100644
--- a/rtic/macros/ui/task-double-priority.rs
+++ b/rtic-macros/ui/task-double-priority.rs
diff --git a/rtic/macros/ui/task-double-priority.stderr b/rtic-macros/ui/task-double-priority.stderr
index b3c814a..b3c814a 100644
--- a/rtic/macros/ui/task-double-priority.stderr
+++ b/rtic-macros/ui/task-double-priority.stderr
diff --git a/rtic/macros/ui/task-double-shared.rs b/rtic-macros/ui/task-double-shared.rs
index f9812d3..f9812d3 100644
--- a/rtic/macros/ui/task-double-shared.rs
+++ b/rtic-macros/ui/task-double-shared.rs
diff --git a/rtic/macros/ui/task-double-shared.stderr b/rtic-macros/ui/task-double-shared.stderr
index bb90212..bb90212 100644
--- a/rtic/macros/ui/task-double-shared.stderr
+++ b/rtic-macros/ui/task-double-shared.stderr
diff --git a/rtic/macros/ui/task-idle.rs b/rtic-macros/ui/task-idle.rs
index 353c782..353c782 100644
--- a/rtic/macros/ui/task-idle.rs
+++ b/rtic-macros/ui/task-idle.rs
diff --git a/rtic/macros/ui/task-idle.stderr b/rtic-macros/ui/task-idle.stderr
index 4ccc113..4ccc113 100644
--- a/rtic/macros/ui/task-idle.stderr
+++ b/rtic-macros/ui/task-idle.stderr
diff --git a/rtic/macros/ui/task-init.rs b/rtic-macros/ui/task-init.rs
index e58fdce..e58fdce 100644
--- a/rtic/macros/ui/task-init.rs
+++ b/rtic-macros/ui/task-init.rs
diff --git a/rtic/macros/ui/task-init.stderr b/rtic-macros/ui/task-init.stderr
index 161e194..161e194 100644
--- a/rtic/macros/ui/task-init.stderr
+++ b/rtic-macros/ui/task-init.stderr
diff --git a/rtic/macros/ui/task-interrupt.rs b/rtic-macros/ui/task-interrupt.rs
index 3d50bd8..3d50bd8 100644
--- a/rtic/macros/ui/task-interrupt.rs
+++ b/rtic-macros/ui/task-interrupt.rs
diff --git a/rtic/macros/ui/task-interrupt.stderr b/rtic-macros/ui/task-interrupt.stderr
index 087b6c6..087b6c6 100644
--- a/rtic/macros/ui/task-interrupt.stderr
+++ b/rtic-macros/ui/task-interrupt.stderr
diff --git a/rtic/macros/ui/task-no-context.rs b/rtic-macros/ui/task-no-context.rs
index 55e8c3b..55e8c3b 100644
--- a/rtic/macros/ui/task-no-context.rs
+++ b/rtic-macros/ui/task-no-context.rs
diff --git a/rtic/macros/ui/task-no-context.stderr b/rtic-macros/ui/task-no-context.stderr
index 62147aa..62147aa 100644
--- a/rtic/macros/ui/task-no-context.stderr
+++ b/rtic-macros/ui/task-no-context.stderr
diff --git a/rtic/macros/ui/task-priority-too-high.rs b/rtic-macros/ui/task-priority-too-high.rs
index f33ba56..f33ba56 100644
--- a/rtic/macros/ui/task-priority-too-high.rs
+++ b/rtic-macros/ui/task-priority-too-high.rs
diff --git a/rtic/macros/ui/task-priority-too-high.stderr b/rtic-macros/ui/task-priority-too-high.stderr
index 5790c88..5790c88 100644
--- a/rtic/macros/ui/task-priority-too-high.stderr
+++ b/rtic-macros/ui/task-priority-too-high.stderr
diff --git a/rtic/macros/ui/task-priority-too-low.rs b/rtic-macros/ui/task-priority-too-low.rs
index 16e0557..16e0557 100644
--- a/rtic/macros/ui/task-priority-too-low.rs
+++ b/rtic-macros/ui/task-priority-too-low.rs
diff --git a/rtic/macros/ui/task-priority-too-low.stderr b/rtic-macros/ui/task-priority-too-low.stderr
index 85c8660..85c8660 100644
--- a/rtic/macros/ui/task-priority-too-low.stderr
+++ b/rtic-macros/ui/task-priority-too-low.stderr
diff --git a/rtic/macros/ui/task-pub.rs b/rtic-macros/ui/task-pub.rs
index 1ae533f..1ae533f 100644
--- a/rtic/macros/ui/task-pub.rs
+++ b/rtic-macros/ui/task-pub.rs
diff --git a/rtic/macros/ui/task-pub.stderr b/rtic-macros/ui/task-pub.stderr
index 7b9813d..7b9813d 100644
--- a/rtic/macros/ui/task-pub.stderr
+++ b/rtic-macros/ui/task-pub.stderr
diff --git a/rtic/macros/ui/task-unsafe.rs b/rtic-macros/ui/task-unsafe.rs
index a8383ef..a8383ef 100644
--- a/rtic/macros/ui/task-unsafe.rs
+++ b/rtic-macros/ui/task-unsafe.rs
diff --git a/rtic/macros/ui/task-unsafe.stderr b/rtic-macros/ui/task-unsafe.stderr
index 90ac76f..90ac76f 100644
--- a/rtic/macros/ui/task-unsafe.stderr
+++ b/rtic-macros/ui/task-unsafe.stderr
diff --git a/rtic/macros/ui/task-zero-prio.rs b/rtic-macros/ui/task-zero-prio.rs
index de3c86f..de3c86f 100644
--- a/rtic/macros/ui/task-zero-prio.rs
+++ b/rtic-macros/ui/task-zero-prio.rs
diff --git a/rtic/macros/ui/task-zero-prio.stderr b/rtic-macros/ui/task-zero-prio.stderr
index 1ab9aab..1ab9aab 100644
--- a/rtic/macros/ui/task-zero-prio.stderr
+++ b/rtic-macros/ui/task-zero-prio.stderr
diff --git a/rtic/Cargo.toml b/rtic/Cargo.toml
index 1aba9c7..9fa9f9d 100644
--- a/rtic/Cargo.toml
+++ b/rtic/Cargo.toml
@@ -38,7 +38,7 @@ cortex-m = "0.7.0"
 bare-metal = "1.0.0"
 #portable-atomic = { version = "0.3.19" }
 atomic-polyfill = "1"
-rtic-macros = { path = "./macros", version = "2.0.0-alpha.0" }
+rtic-macros = { path = "../rtic-macros", version = "2.0.0-alpha.0" }
 rtic-core = "1"
 
 
@@ -65,32 +65,6 @@ version = "0.6.0"
 [target.x86_64-unknown-linux-gnu.dev-dependencies]
 trybuild = "1"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
-[workspace]
-members = ["macros", "xtask"]
-
-# do not optimize proc-macro deps or build scripts
-[profile.dev.build-override]
-codegen-units = 16
-debug = false
-debug-assertions = false
-opt-level = 0
-overflow-checks = false
-
-
-[profile.release.build-override]
-codegen-units = 16
-debug = false
-debug-assertions = false
-opt-level = 0
-overflow-checks = false
-
-[patch.crates-io]
-lm3s6965 = { git = "https://github.com/japaric/lm3s6965" }
-
 [features]
 test-critical-section = ["cortex-m/critical-section-single-core", "rtic-monotonics/systick_100hz"]
 
diff --git a/rtic/rust-toolchain.toml b/rust-toolchain.toml
index e28b55d..e28b55d 100644
--- a/rtic/rust-toolchain.toml
+++ b/rust-toolchain.toml
diff --git a/rtic/xtask/Cargo.toml b/xtask/Cargo.toml
index fa4f7d7..fa4f7d7 100644
--- a/rtic/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
diff --git a/rtic/xtask/src/build.rs b/xtask/src/build.rs
index a11b4e0..a11b4e0 100644
--- a/rtic/xtask/src/build.rs
+++ b/xtask/src/build.rs
diff --git a/rtic/xtask/src/command.rs b/xtask/src/command.rs
index 6be1463..6be1463 100644
--- a/rtic/xtask/src/command.rs
+++ b/xtask/src/command.rs
diff --git a/rtic/xtask/src/main.rs b/xtask/src/main.rs
index eff8668..7c0ed20 100644
--- a/rtic/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -116,7 +116,7 @@ fn main() -> anyhow::Result<()> {
 
     let targets = [ARMV7M, ARMV6M];
 
-    let mut examples: Vec<_> = std::fs::read_dir("./examples")?
+    let mut examples: Vec<_> = std::fs::read_dir("./rtic/examples")?
         .filter_map(|p| p.ok())
         .map(|p| p.path())
         .filter(|p| p.display().to_string().ends_with(".rs"))
@@ -207,7 +207,7 @@ fn arm_example(command: &CargoCommand) -> anyhow::Result<()> {
     match *command {
         CargoCommand::Run { example, .. } => {
             let run_file = format!("{example}.run");
-            let expected_output_file = ["ci", "expected", &run_file]
+            let expected_output_file = ["rtic", "ci", "expected", &run_file]
                 .iter()
                 .collect::<PathBuf>()
                 .into_os_string()