From a650f29abedf07a39d1f30fd75439be1738a104e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 13 Oct 2020 11:10:26 +0200 Subject: [PATCH] Rename sixtyfps-rs-macro to sixtyfps-macros --- Cargo.toml | 2 +- api/sixtyfps-rs/Cargo.toml | 2 +- api/sixtyfps-rs/lib.rs | 2 +- .../{sixtyfps-rs-macro => sixtyfps-macros}/Cargo.toml | 2 +- api/sixtyfps-rs/{sixtyfps-rs-macro => sixtyfps-macros}/lib.rs | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename api/sixtyfps-rs/{sixtyfps-rs-macro => sixtyfps-macros}/Cargo.toml (94%) rename api/sixtyfps-rs/{sixtyfps-rs-macro => sixtyfps-macros}/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 4c4f17a2c..2c712ecd1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = [ 'sixtyfps_compiler', 'sixtyfps_compiler/parser_test_macro', 'api/sixtyfps-rs', - 'api/sixtyfps-rs/sixtyfps-rs-macro', + 'api/sixtyfps-rs/sixtyfps-macros', 'api/sixtyfps-rs/sixtyfps-build', 'api/sixtyfps-node/native', 'api/sixtyfps-wasm-interpreter', diff --git a/api/sixtyfps-rs/Cargo.toml b/api/sixtyfps-rs/Cargo.toml index 7d4b46297..a03efe9a7 100644 --- a/api/sixtyfps-rs/Cargo.toml +++ b/api/sixtyfps-rs/Cargo.toml @@ -17,7 +17,7 @@ wayland = ["sixtyfps-rendering-backend-default/wayland"] [dependencies] once_cell = "1.4" -sixtyfps-rs-macro= { version = "=0.0.1", path = "sixtyfps-rs-macro" } +sixtyfps-macros = { version = "=0.0.1", path = "sixtyfps-macros" } const-field-offset = { version = "0.1", path = "../../helper_crates/const-field-offset" } vtable = { version = "0.1", path = "../../helper_crates/vtable" } sixtyfps-corelib = { version = "=0.0.1", path="../../sixtyfps_runtime/corelib" } diff --git a/api/sixtyfps-rs/lib.rs b/api/sixtyfps-rs/lib.rs index dd92a21c4..3ea3b689b 100644 --- a/api/sixtyfps-rs/lib.rs +++ b/api/sixtyfps-rs/lib.rs @@ -108,7 +108,7 @@ The follow table summarizes the entire mapping: #![warn(missing_docs)] #![deny(unsafe_code)] -pub use sixtyfps_rs_macro::sixtyfps; +pub use sixtyfps_macros::sixtyfps; pub use sixtyfps_corelib::model::{ Model, ModelHandle, ModelNotify, ModelPeer, StandardListViewItem, VecModel, diff --git a/api/sixtyfps-rs/sixtyfps-rs-macro/Cargo.toml b/api/sixtyfps-rs/sixtyfps-macros/Cargo.toml similarity index 94% rename from api/sixtyfps-rs/sixtyfps-rs-macro/Cargo.toml rename to api/sixtyfps-rs/sixtyfps-macros/Cargo.toml index 656ed1a3b..240d21edc 100644 --- a/api/sixtyfps-rs/sixtyfps-rs-macro/Cargo.toml +++ b/api/sixtyfps-rs/sixtyfps-macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sixtyfps-rs-macro" +name = "sixtyfps-macros" version = "0.0.1" authors = ["SixtyFPS "] edition = "2018" diff --git a/api/sixtyfps-rs/sixtyfps-rs-macro/lib.rs b/api/sixtyfps-rs/sixtyfps-macros/lib.rs similarity index 100% rename from api/sixtyfps-rs/sixtyfps-rs-macro/lib.rs rename to api/sixtyfps-rs/sixtyfps-macros/lib.rs