From 8e68c80c06630fc6e3891efa44d21f15fc81d14d Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Thu, 24 Apr 2025 02:02:47 +0900 Subject: [PATCH 1/3] update(generator): change top mod path (remove top level mod) --- CHANGELOG.md | 1 + src/generator.rs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a155b60..5212799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Improve error message from syn in generator. !15 +- Removed top level module (register_interface), and now it can have arbitrary name. ## [0.3.1] - 2025-04-11 diff --git a/src/generator.rs b/src/generator.rs index 110e4f1..b6cd10d 100644 --- a/src/generator.rs +++ b/src/generator.rs @@ -176,7 +176,7 @@ This code is auto generated using endcap_sl_software_ri_generator. .map(|(path, tokens)| -> Result<(PathBuf, syn::File), _> { let tokens = if path .file_name() - .is_some_and(|file| file == "register_interface.rs") + .is_some_and(|file| file == "lib.rs") { quote! { #![doc = #build_metadata] @@ -234,10 +234,10 @@ impl CodeGen for Module { pub use super::RegisterInterface; }; - files.insert(PathBuf::from("./register_interface.rs"), out); + files.insert(PathBuf::from("./lib.rs"), out); let ident_register_interface = util::parse_to_ident("RegisterInterface").unwrap(); - let register_interface_mod = PathBuf::from("register_interface"); + let register_interface_mod = PathBuf::from("./"); let files = self .elements_other .into_iter() From 516cfa9151502554d0fc0b13fa77fb55127e7c78 Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Thu, 24 Apr 2025 02:07:38 +0900 Subject: [PATCH 2/3] fix(generator): top level mod should be mod.rs instead of lib.rs --- src/generator.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generator.rs b/src/generator.rs index b6cd10d..2c9ac1e 100644 --- a/src/generator.rs +++ b/src/generator.rs @@ -176,7 +176,7 @@ This code is auto generated using endcap_sl_software_ri_generator. .map(|(path, tokens)| -> Result<(PathBuf, syn::File), _> { let tokens = if path .file_name() - .is_some_and(|file| file == "lib.rs") + .is_some_and(|file| file == "mod.rs") { quote! { #![doc = #build_metadata] @@ -234,7 +234,7 @@ impl CodeGen for Module { pub use super::RegisterInterface; }; - files.insert(PathBuf::from("./lib.rs"), out); + files.insert(PathBuf::from("./mod.rs"), out); let ident_register_interface = util::parse_to_ident("RegisterInterface").unwrap(); let register_interface_mod = PathBuf::from("./"); From b8d18b26fccfef6c5554d67f151788d8f65ccbb9 Mon Sep 17 00:00:00 2001 From: Wataru Otsubo Date: Thu, 24 Apr 2025 02:11:31 +0900 Subject: [PATCH 3/3] format --- src/generator.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/generator.rs b/src/generator.rs index 2c9ac1e..8fa5ff7 100644 --- a/src/generator.rs +++ b/src/generator.rs @@ -174,10 +174,7 @@ This code is auto generated using endcap_sl_software_ri_generator. files .into_iter() .map(|(path, tokens)| -> Result<(PathBuf, syn::File), _> { - let tokens = if path - .file_name() - .is_some_and(|file| file == "mod.rs") - { + let tokens = if path.file_name().is_some_and(|file| file == "mod.rs") { quote! { #![doc = #build_metadata]