From cb7d92a714332736d4026056c69c28afdbc49d84 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Sat, 18 May 2024 00:22:20 +0200 Subject: [PATCH] put module `api` in api.rs like before instead of `api/mod.rs` This is needed since some builds do not remove old files and then cargo doesn't know which one to use. (for example GitHub-Actions) --- etc/api/type-api.yaml | 2 +- .../templates/api/{api/mod.rs.mako => api.rs.mako} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename src/generator/templates/api/{api/mod.rs.mako => api.rs.mako} (78%) diff --git a/etc/api/type-api.yaml b/etc/api/type-api.yaml index 99fe0a9502..d80b0a839c 100644 --- a/etc/api/type-api.yaml +++ b/etc/api/type-api.yaml @@ -20,7 +20,7 @@ make: - source: ../Cargo.toml - source: lib.rs output_dir: src - - source: api/mod.rs + - source: api.rs output_dir: src - source: api/utilities.rs output_dir: src diff --git a/src/generator/templates/api/api/mod.rs.mako b/src/generator/templates/api/api.rs.mako similarity index 78% rename from src/generator/templates/api/api/mod.rs.mako rename to src/generator/templates/api/api.rs.mako index 30f2890854..c2a5aee7b3 100644 --- a/src/generator/templates/api/api/mod.rs.mako +++ b/src/generator/templates/api/api.rs.mako @@ -1,8 +1,8 @@ -<%namespace name="lib" file="../lib/lib.mako"/>\ -<%namespace name="util" file="../../../lib/util.mako"/>\ -<%namespace name="rbuild" file="../lib/rbuild.mako"/>\ -<%namespace name="mbuild" file="../lib/mbuild.mako"/>\ -<%namespace name="schema" file="../lib/schema.mako"/>\ +<%namespace name="lib" file="lib/lib.mako"/>\ +<%namespace name="util" file="../../lib/util.mako"/>\ +<%namespace name="rbuild" file="lib/rbuild.mako"/>\ +<%namespace name="mbuild" file="lib/mbuild.mako"/>\ +<%namespace name="schema" file="lib/schema.mako"/>\ <% from generator.lib.util import (new_context, hub_type, hub_type_params_s)