rid-derive: renamed to rid-macro

thlorenz · Mar 4, 2021 · c6e403a · c6e403a
1 parent d99b87d
commit c6e403a
Show file tree

Hide file tree

Showing 34 changed files with 13 additions and 15 deletions.
diff --git a/rid-build/fixtures/foo-bar-baz/Cargo.toml b/rid-build/fixtures/foo-bar-baz/Cargo.toml
@@ -11,4 +11,4 @@ name = "foo_bar_baz"
 path = "main.rs"
 
 [dependencies]
-rid_derive = { path = "../../../rid-derive" }
+rid_macro = { path = "../../../rid-macro" }
diff --git a/rid-build/fixtures/foo-bar-baz/main.rs b/rid-build/fixtures/foo-bar-baz/main.rs
@@ -1,6 +1,6 @@
 use std::ffi::CString;
 
-use rid_derive::Rid;
+use rid_macro::Rid;
 
 #[derive(Rid)]
 pub struct Foo {

diff --git a/rid-build/src/dart_generator.rs b/rid-build/src/dart_generator.rs
@@ -52,7 +52,7 @@ pub(crate) struct DartGenerator<'a> {
     pub(crate) lib_name: &'a str,
 
     /// Content of binding.h generated by cbindgen with functions and structs expanded via
-    /// rid-derive.
+    /// rid-macro.
     pub(crate) binding: &'a str,
 
     /// Rust library to load, Release or Debug.

diff --git a/rid-build/src/lib.rs b/rid-build/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(str_split_once)]
-
 use std::{fs, path::Path};
 
 use anyhow::Result;

diff --git a/rid-common/src/constants.rs b/rid-common/src/constants.rs
@@ -1,4 +1,4 @@
-// Constants used in code generated via rid-derive and bindgen as well as the higher level dart
+// Constants used in code generated via rid-macro and bindgen as well as the higher level dart
 // wrapper generated by rid-build.
 
 /// Bindings generated by ffigen are imported into the build wrapper as this id.

diff --git a/rid-derive-test/Cargo.toml → rid-macro-test/Cargo.toml b/rid-derive-test/Cargo.toml → rid-macro-test/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name = "rid_derive_test"
+name = "rid_macro_test"
 version = "0.0.0"
 edition = "2018"
 publish = false
 
 [workspace]
 
 [[bin]]
-name = "rid_derive_test"
+name = "rid_macro_test"
 path = "main.rs"
 
 [dependencies]
-rid_derive = { path = "../rid-derive" }
+rid_macro = { path = "../rid-macro" }
diff --git a/rid-derive-test/Makefile → rid-macro-test/Makefile b/rid-derive-test/Makefile → rid-macro-test/Makefile
@@ -1,5 +1,5 @@
 MAIN=./main.rs
-RID_DERIVES=../rid-derive/src/*.rs
+RID_MACROS=../rid-macro/src/*.rs
 
 MAIN_EXPANDED=./main-expanded.rs
 
@@ -17,7 +17,7 @@ bindgen: $(BINDING_C)
 $(BINDING_C): $(MAIN_EXPANDED)
 	cbindgen -c cbindgen.toml $< -o $(BINDING_C)
 
-$(MAIN_EXPANDED): $(MAIN) $(RID_DERIVES)
+$(MAIN_EXPANDED): $(MAIN) $(RID_MACROS)
 	cargo expand > $@
 
 clean:

diff --git a/rid-derive-test/cbindgen.toml → rid-macro-test/cbindgen.toml b/rid-derive-test/cbindgen.toml → rid-macro-test/cbindgen.toml
@@ -13,5 +13,5 @@ includes=["stdint.h"]
 [parse]
 parse_deps = false
 # Why does this not expand??
-# cbindgen -c cbindgen.toml --crate rid-derive-ws main.rs
-expand = ["rid-derive-ws"]
+# cbindgen -c cbindgen.toml --crate rid-macro-ws main.rs
+expand = ["rid-macro-ws"]
diff --git a/rid-derive-test/main.rs → rid-macro-test/main.rs b/rid-derive-test/main.rs → rid-macro-test/main.rs
@@ -1,6 +1,6 @@
 use std::ffi::CString;
 
-use rid_derive::Rid;
+use rid_macro::Rid;
 
 #[derive(Rid)]
 pub struct Foo {

diff --git a/rid-derive/Cargo.toml → rid-macro/Cargo.toml b/rid-derive/Cargo.toml → rid-macro/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rid_derive"
+name = "rid_macro"
 version = "0.1.0"
 authors = ["Thorsten Lorenz <[email protected]>"]
 edition = "2018"

diff --git a/rid-derive/rustfmt.toml → rid-macro/rustfmt.toml b/rid-derive/rustfmt.toml → rid-macro/rustfmt.toml
diff --git a/rid-derive/src/common/dart.rs → rid-macro/src/common/dart.rs b/rid-derive/src/common/dart.rs → rid-macro/src/common/dart.rs
diff --git a/rid-derive/src/common/errors.rs → rid-macro/src/common/errors.rs b/rid-derive/src/common/errors.rs → rid-macro/src/common/errors.rs
diff --git a/rid-derive/src/common/mod.rs → rid-macro/src/common/mod.rs b/rid-derive/src/common/mod.rs → rid-macro/src/common/mod.rs
diff --git a/rid-derive/src/common/parsed_field.rs → rid-macro/src/common/parsed_field.rs b/rid-derive/src/common/parsed_field.rs → rid-macro/src/common/parsed_field.rs
diff --git a/rid-derive/src/common/resolvers.rs → rid-macro/src/common/resolvers.rs b/rid-derive/src/common/resolvers.rs → rid-macro/src/common/resolvers.rs
diff --git a/rid-derive/src/common/rust.rs → rid-macro/src/common/rust.rs b/rid-derive/src/common/rust.rs → rid-macro/src/common/rust.rs
diff --git a/rid-derive/src/common/state.rs → rid-macro/src/common/state.rs b/rid-derive/src/common/state.rs → rid-macro/src/common/state.rs
diff --git a/rid-derive/src/lib.rs → rid-macro/src/lib.rs b/rid-derive/src/lib.rs → rid-macro/src/lib.rs
diff --git a/rid-derive/src/message/attach.rs → rid-macro/src/message/attach.rs b/rid-derive/src/message/attach.rs → rid-macro/src/message/attach.rs
diff --git a/rid-derive/src/message/mod.rs → rid-macro/src/message/mod.rs b/rid-derive/src/message/mod.rs → rid-macro/src/message/mod.rs
diff --git a/rid-derive/src/message/parsed_enum.rs → rid-macro/src/message/parsed_enum.rs b/rid-derive/src/message/parsed_enum.rs → rid-macro/src/message/parsed_enum.rs
diff --git a/rid-derive/src/message/parsed_variant.rs → rid-macro/src/message/parsed_variant.rs b/rid-derive/src/message/parsed_variant.rs → rid-macro/src/message/parsed_variant.rs
diff --git a/rid-derive/src/message/variant_field.rs → rid-macro/src/message/variant_field.rs b/rid-derive/src/message/variant_field.rs → rid-macro/src/message/variant_field.rs
diff --git a/rid-derive/src/model/attach.rs → rid-macro/src/model/attach.rs b/rid-derive/src/model/attach.rs → rid-macro/src/model/attach.rs
diff --git a/rid-derive/src/model/dart.rs → rid-macro/src/model/dart.rs b/rid-derive/src/model/dart.rs → rid-macro/src/model/dart.rs
diff --git a/rid-derive/src/model/mod.rs → rid-macro/src/model/mod.rs b/rid-derive/src/model/mod.rs → rid-macro/src/model/mod.rs
diff --git a/rid-derive/src/model/parsed_struct.rs → rid-macro/src/model/parsed_struct.rs b/rid-derive/src/model/parsed_struct.rs → rid-macro/src/model/parsed_struct.rs
diff --git a/rid-derive/src/templates/mod.rs → rid-macro/src/templates/mod.rs b/rid-derive/src/templates/mod.rs → rid-macro/src/templates/mod.rs
diff --git a/rid-derive/src/templates/vec.dart → rid-macro/src/templates/vec.dart b/rid-derive/src/templates/vec.dart → rid-macro/src/templates/vec.dart
diff --git a/rid-derive/src/templates/vec.rs → rid-macro/src/templates/vec.rs b/rid-derive/src/templates/vec.rs → rid-macro/src/templates/vec.rs
diff --git a/rid-derive/tests/expand.rs → rid-macro/tests/expand.rs b/rid-derive/tests/expand.rs → rid-macro/tests/expand.rs
diff --git a/...e/tests/expand/structs_simple.expanded.rs → ...o/tests/expand/structs_simple.expanded.rs b/...e/tests/expand/structs_simple.expanded.rs → ...o/tests/expand/structs_simple.expanded.rs
diff --git a/rid-derive/tests/expand/structs_simple.rs → rid-macro/tests/expand/structs_simple.rs b/rid-derive/tests/expand/structs_simple.rs → rid-macro/tests/expand/structs_simple.rs