summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2022-04-01 19:28:32 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2022-04-01 19:32:51 +0100
commitac0b4757965bdc8d57807abeb6723177dc819797 (patch)
tree4a94c6dd37d1068fd7b1a1544d3e354459e565e3
parented25345d6986aca6d115f86ff1ee4cb904340979 (diff)
downloadsubplot-ac0b4757965bdc8d57807abeb6723177dc819797.tar.gz
(subplotlib-derive): Make the builder pass the step text in .build()
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
-rw-r--r--subplotlib-derive/src/lib.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/subplotlib-derive/src/lib.rs b/subplotlib-derive/src/lib.rs
index 42b5e71..7fd1810 100644
--- a/subplotlib-derive/src/lib.rs
+++ b/subplotlib-derive/src/lib.rs
@@ -307,8 +307,6 @@ fn process_step(mut input: ItemFn) -> proc_macro2::TokenStream {
})
.collect();
- let stepnamestr = format!("{}", stepname);
-
let builder_body = if ty_is_scenariocontext(&contexttype) {
quote! {
#stepname(ctx,#(#buildargs),*)
@@ -323,8 +321,8 @@ fn process_step(mut input: ItemFn) -> proc_macro2::TokenStream {
impl Builder {
#(#fieldfns)*
- pub fn build(self) -> ScenarioStep {
- ScenarioStep::new(#stepnamestr, move |ctx, _defuse_poison|
+ pub fn build(self, step_text: String) -> ScenarioStep {
+ ScenarioStep::new(step_text, move |ctx, _defuse_poison|
#builder_body,
|scenario| register_contexts(scenario)
)