rust: Switch to a neater module based step function derive

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/subplotlib/tests/subplotlib.rs b/subplotlib/tests/subplotlib.rs
index a21f555..f2a7921 100644
--- a/subplotlib/tests/subplotlib.rs
+++ b/subplotlib/tests/subplotlib.rs
@@ -99,20 +99,20 @@ lazy_static! {
 fn fundamentals() {
     let mut scenario = Scenario::new(&base64_decode("RnVuZGFtZW50YWxz"));
 
-    let step = BUILDER_a_trivial_setup::default().build();
-    let cleanup = BUILDER_a_trivial_cleanup::default().build();
+    let step = a_trivial_setup::Builder::default().build();
+    let cleanup = a_trivial_cleanup::Builder::default().build();
     scenario.add_step(step, Some(cleanup));
 
-    let step = BUILDER_increment_counter::default().build();
+    let step = increment_counter::Builder::default().build();
     scenario.add_step(step, None);
 
-    let step = BUILDER_check_counter::default().num(1).build();
+    let step = check_counter::Builder::default().num(1).build();
     scenario.add_step(step, None);
 
-    let step = BUILDER_increment_counter::default().build();
+    let step = increment_counter::Builder::default().build();
     scenario.add_step(step, None);
 
-    let step = BUILDER_check_counter::default().num(2).build();
+    let step = check_counter::Builder::default().num(2).build();
     scenario.add_step(step, None);
 
     scenario.run().unwrap();
@@ -125,7 +125,7 @@ fn fundamentals() {
 fn embedded_files() {
     let mut scenario = Scenario::new(&base64_decode("RW1iZWRkZWQgZmlsZXM="));
 
-    let step = BUILDER_acquire_file_content::default()
+    let step = acquire_file_content::Builder::default()
         .file({
             use std::path::PathBuf;
             // example.txt
@@ -143,7 +143,7 @@ fn embedded_files() {
         .build();
     scenario.add_step(step, None);
 
-    let step = BUILDER_remember_target::default()
+    let step = remember_target::Builder::default()
         .somename(
             // "EXAMPLE"
             &base64_decode("RVhBTVBMRQ=="),
@@ -151,7 +151,7 @@ fn embedded_files() {
         .build();
     scenario.add_step(step, None);
 
-    let step = BUILDER_check_contents::default()
+    let step = check_contents::Builder::default()
         .text(
             // "will be embedded"
             &base64_decode("d2lsbCBiZSBlbWJlZGRlZA=="),