From fc852fdda387df1fe37841f1e561bc80789f0930 Mon Sep 17 00:00:00 2001 From: Jessica Stringham Date: Fri, 6 Feb 2026 15:42:38 -0500 Subject: [PATCH] move folder --- Cargo.toml | 6 ++---- README.md | 2 +- murrelet/Cargo.toml | 3 --- murrelet_draw/Cargo.toml | 2 -- murrelet_gpu/Cargo.toml | 1 - .../Cargo.toml | 0 .../examples/tests.rs | 0 .../src/derive_cached.rs | 0 .../src/derive_graphics_trait.rs | 0 .../src/derive_lazy.rs | 0 .../src/derive_livecode.rs | 0 .../src/derive_nestedit.rs | 0 .../src/lib.rs | 0 .../src/parser.rs | 0 .../src/toplevel.rs | 0 murrelet_livecode_macros/Cargo.toml | 17 ----------------- murrelet_livecode_macros/src/lib.rs | 1 - murrelet_perform/Cargo.toml | 2 -- 18 files changed, 3 insertions(+), 31 deletions(-) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/Cargo.toml (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/examples/tests.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/derive_cached.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/derive_graphics_trait.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/derive_lazy.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/derive_livecode.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/derive_nestedit.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/lib.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/parser.rs (100%) rename {murrelet_livecode_macros/murrelet_livecode_derive => murrelet_livecode_derive}/src/toplevel.rs (100%) delete mode 100644 murrelet_livecode_macros/Cargo.toml delete mode 100644 murrelet_livecode_macros/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 86e740b..bc9ab1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,7 @@ members = [ "murrelet_draw", "murrelet_gpu", "murrelet_livecode", - "murrelet_livecode_macros", - "murrelet_livecode_macros/murrelet_livecode_derive", + "murrelet_livecode_derive", "murrelet_perform", "murrelet_src_audio", "murrelet_src_midi", @@ -29,8 +28,7 @@ murrelet_common = { path = "murrelet_common", version = "0.1.2" } murrelet_draw = { path = "murrelet_draw", version = "0.1.2", default-features = false } murrelet_gpu = { path = "murrelet_gpu", version = "0.1.2" } murrelet_livecode = { path = "murrelet_livecode", version = "0.1.2", default-features = false } -murrelet_livecode_macros = { path = "murrelet_livecode_macros", version = "0.1.2", default-features = false } -murrelet_livecode_derive = { path = "murrelet_livecode_macros/murrelet_livecode_derive", version = "0.1.2", default-features = false } +murrelet_livecode_derive = { path = "murrelet_livecode_derive", version = "0.1.2", default-features = false } murrelet_perform = { path = "murrelet_perform", version = "0.1.2", default-features = false } murrelet_src_audio = { path = "murrelet_src_audio", version = "0.1.2" } murrelet_src_midi = { path = "murrelet_src_midi", version = "0.1.2" } diff --git a/README.md b/README.md index bb3a790..f0e3a7d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ I wanted to open source my code so I could share some ideas of how I've been imp This repo can be broken down into a few parts: - livecode macros and code: how I turn Rust sketches into YAML-controlled live performance. - - general code for parsing and evaluating livecode expressions: *murrelet_livecode, murrelet_livecode_macros* + - general code for parsing and evaluating livecode expressions: *murrelet_livecode, murrelet_livecode_derive* - specific code for livecoding (hot-swapping configs, some generic parameters): *murrelet_perform* - platform-specific packages for adding more sources: *murrelet_src_audio, murrelet_src_audio* - *murrelet_gpu*: some cute little macros for managing and chaining shaders. (this is _not_ live at the moment) diff --git a/murrelet/Cargo.toml b/murrelet/Cargo.toml index c6f9602..179decd 100644 --- a/murrelet/Cargo.toml +++ b/murrelet/Cargo.toml @@ -13,14 +13,12 @@ description = "Murrelet the live coding framework for visuals" schemars = [ "murrelet_draw/schemars", "murrelet_livecode/schemars", - "murrelet_livecode_macros/schemars", "murrelet_livecode_derive/schemars", "murrelet_perform/schemars", ] # murrelet_gui = [ # "murrelet_draw/murrelet_gui", # "murrelet_livecode/murrelet_gui", -# "murrelet_livecode_macros/murrelet_gui", # "murrelet_livecode_derive/murrelet_gui", # "murrelet_perform/murrelet_gui", # ] @@ -35,6 +33,5 @@ serde_yaml = "0.9.17" murrelet_common = { workspace = true } murrelet_draw = { workspace = true, default-features = false } murrelet_livecode = { workspace = true, default-features = false } -murrelet_livecode_macros = { workspace = true, default-features = false } murrelet_livecode_derive = { workspace = true, default-features = false } murrelet_perform = { workspace = true, default-features = false } diff --git a/murrelet_draw/Cargo.toml b/murrelet_draw/Cargo.toml index 2e39a85..da7f277 100644 --- a/murrelet_draw/Cargo.toml +++ b/murrelet_draw/Cargo.toml @@ -11,7 +11,6 @@ license = "AGPL-3.0-or-later" schemars = [ "dep:schemars", "murrelet_livecode/schemars", - "murrelet_livecode_macros/schemars", "murrelet_livecode_derive/schemars", ] @@ -20,7 +19,6 @@ schemars = [ murrelet_common = { workspace = true } murrelet_livecode = { workspace = true, default-features = false } -murrelet_livecode_macros = { workspace = true, default-features = false } murrelet_livecode_derive = { workspace = true, default-features = false } lerpable = { version = "0.0.3", features = ["glam"] } diff --git a/murrelet_gpu/Cargo.toml b/murrelet_gpu/Cargo.toml index 3ea97c8..849384b 100644 --- a/murrelet_gpu/Cargo.toml +++ b/murrelet_gpu/Cargo.toml @@ -27,7 +27,6 @@ naga = { version = "0.20.0", features = ["wgsl-in"] } murrelet_common = { workspace = true } murrelet_livecode = { workspace = true, default-features = false } murrelet_draw = { workspace = true, default-features = false } -murrelet_livecode_macros = { workspace = true } murrelet_livecode_derive = { workspace = true } murrelet_perform = { workspace = true, default-features = false } diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/Cargo.toml b/murrelet_livecode_derive/Cargo.toml similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/Cargo.toml rename to murrelet_livecode_derive/Cargo.toml diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/examples/tests.rs b/murrelet_livecode_derive/examples/tests.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/examples/tests.rs rename to murrelet_livecode_derive/examples/tests.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/derive_cached.rs b/murrelet_livecode_derive/src/derive_cached.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/derive_cached.rs rename to murrelet_livecode_derive/src/derive_cached.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/derive_graphics_trait.rs b/murrelet_livecode_derive/src/derive_graphics_trait.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/derive_graphics_trait.rs rename to murrelet_livecode_derive/src/derive_graphics_trait.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/derive_lazy.rs b/murrelet_livecode_derive/src/derive_lazy.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/derive_lazy.rs rename to murrelet_livecode_derive/src/derive_lazy.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/derive_livecode.rs b/murrelet_livecode_derive/src/derive_livecode.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/derive_livecode.rs rename to murrelet_livecode_derive/src/derive_livecode.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/derive_nestedit.rs b/murrelet_livecode_derive/src/derive_nestedit.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/derive_nestedit.rs rename to murrelet_livecode_derive/src/derive_nestedit.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/lib.rs b/murrelet_livecode_derive/src/lib.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/lib.rs rename to murrelet_livecode_derive/src/lib.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/parser.rs b/murrelet_livecode_derive/src/parser.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/parser.rs rename to murrelet_livecode_derive/src/parser.rs diff --git a/murrelet_livecode_macros/murrelet_livecode_derive/src/toplevel.rs b/murrelet_livecode_derive/src/toplevel.rs similarity index 100% rename from murrelet_livecode_macros/murrelet_livecode_derive/src/toplevel.rs rename to murrelet_livecode_derive/src/toplevel.rs diff --git a/murrelet_livecode_macros/Cargo.toml b/murrelet_livecode_macros/Cargo.toml deleted file mode 100644 index 02fbbaf..0000000 --- a/murrelet_livecode_macros/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "murrelet_livecode_macros" -version = "0.1.2" -edition = "2021" -authors = ["Jessica Stringham "] -repository = "https://github.com/jessstringham/murrelet.git" -description = "livecode macros for murrelet, a livecode framework" -license = "AGPL-3.0-or-later" - -[features] -schemars = ["murrelet_livecode/schemars", "murrelet_livecode_derive/schemars"] -# murrelet_gui = ["murrelet_livecode/murrelet_gui", "murrelet_livecode_derive/murrelet_gui"] - - -[dependencies] -murrelet_livecode_derive = { workspace = true, default-features = false } -murrelet_livecode = { workspace = true, default-features = false } diff --git a/murrelet_livecode_macros/src/lib.rs b/murrelet_livecode_macros/src/lib.rs deleted file mode 100644 index 34e525f..0000000 --- a/murrelet_livecode_macros/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -extern crate murrelet_livecode_derive; diff --git a/murrelet_perform/Cargo.toml b/murrelet_perform/Cargo.toml index c814239..428ad1a 100644 --- a/murrelet_perform/Cargo.toml +++ b/murrelet_perform/Cargo.toml @@ -13,7 +13,6 @@ schemars = [ "dep:schemars", "murrelet_livecode/schemars", "murrelet_draw/schemars", - "murrelet_livecode_macros/schemars", "murrelet_livecode_derive/schemars", ] @@ -21,7 +20,6 @@ schemars = [ murrelet_common = { workspace = true } murrelet_livecode = { workspace = true, default-features = false } murrelet_draw = { workspace = true, default-features = false } -murrelet_livecode_macros = { workspace = true, default-features = false } murrelet_livecode_derive = { workspace = true, default-features = false } lerpable = { version = "0.0.3" } serde = { version = "1.0.104", features = ["derive"] }