Rust: cleanup import and test architecture files

grame-cncm · Dec 1, 2024 · 8fd319c · 8fd319c
1 parent 9a4dd16
commit 8fd319c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 32 deletions.
diff --git a/compiler/generator/rust/rust_code_container.cpp b/compiler/generator/rust/rust_code_container.cpp
@@ -236,8 +236,6 @@ void RustCodeContainer::produceClass()
     tab(n, *fOut);
     *fOut << "pub type FaustFloat = " << ifloat() << ";";
 
-    tab(n, *fOut);
-    *fOut << "use std::convert::TryInto;";
     tab(n, *fOut);
     *fOut << "use std::borrow;";
 

diff --git a/tests/impulse-tests/archs/rust/architecture_cm.rs b/tests/impulse-tests/archs/rust/architecture_cm.rs
@@ -29,12 +29,9 @@ extern crate libm;
 extern crate num_traits;
 /* extern crate fastfloat; */
 
-use std::env;
-use std::fs::File;
-use std::io::Write;
-
 use default_boxed::DefaultBoxed;
 use num_traits::{cast::FromPrimitive, float::Float};
+use std::{env, fs::File, io::Write};
 
 type F32 = f32;
 type F64 = f64;
@@ -180,10 +177,10 @@ impl<T: Float + FromPrimitive> UI<T> for ButtonUI {
 }
 
 // // Generated intrinsics:
-// <<includeIntrinsic>>
+<<includeIntrinsic>>
 
 // // Generated class:
-// <<includeclass>>
+<<includeclass>>
 
 const SAMPLE_RATE: i32 = 44100;
 

diff --git a/tests/impulse-tests/archs/rust/architecture_ecrnt.rs b/tests/impulse-tests/archs/rust/architecture_ecrnt.rs
@@ -152,10 +152,10 @@ impl<T: Float + FromPrimitive> UI<T> for ButtonUI {
     fn declare(&mut self, param: Option<ParamIndex>, key: &str, value: &str) {}
 }
 
-// Generated intrinsics:
+// // Generated intrinsics:
 <<includeIntrinsic>>
 
-// Generated class:
+// // Generated class:
 <<includeclass>>
 
 const SAMPLE_RATE: i32 = 44100;

diff --git a/tests/impulse-tests/archs/rust/architecture_inpl.rs b/tests/impulse-tests/archs/rust/architecture_inpl.rs
@@ -29,12 +29,9 @@ extern crate libm;
 extern crate num_traits;
 /* extern crate fastfloat; */
 
-use std::env;
-use std::fs::File;
-use std::io::Write;
-
 use default_boxed::DefaultBoxed;
 use num_traits::{cast::FromPrimitive, float::Float};
+use std::{env, fs::File, io::Write};
 
 type F32 = f32;
 type F64 = f64;
@@ -152,10 +149,10 @@ impl<T: Float + FromPrimitive> UI<T> for ButtonUI {
     fn declare(&mut self, param: Option<ParamIndex>, key: &str, value: &str) {}
 }
 
-// Generated intrinsics:
+// // Generated intrinsics:
 <<includeIntrinsic>>
 
-// Generated class:
+// // Generated class:
 <<includeclass>>
 
 const SAMPLE_RATE: i32 = 44100;
@@ -181,7 +178,8 @@ fn run_dsp(
 
     // Prepare buffers
     //let mut in_buffer = vec![vec![0 as FaustFloat; buffer_size]; FAUST_INPUTS];
-    let mut buffers = vec![vec![0 as FaustFloat; buffer_size]; std::cmp::max(FAUST_INPUTS, FAUST_OUTPUTS)];
+    let mut buffers =
+        vec![vec![0 as FaustFloat; buffer_size]; std::cmp::max(FAUST_INPUTS, FAUST_OUTPUTS)];
 
     // Prepare UI
     let mut ui = ButtonUI {
@@ -197,7 +195,7 @@ fn run_dsp(
 
         // handle inputs
         for buffer in buffers.iter_mut() {
-            for (i,sample) in buffer.iter_mut().enumerate() {
+            for (i, sample) in buffer.iter_mut().enumerate() {
                 let first_frame = num_samples_written == 0 && i == 0;
                 *sample = if first_frame { 1.0 } else { 0.0 };
             }

diff --git a/tests/impulse-tests/archs/rust/architecture_osecrnt.rs b/tests/impulse-tests/archs/rust/architecture_osecrnt.rs
@@ -29,12 +29,9 @@ extern crate libm;
 extern crate num_traits;
 /* extern crate fastfloat; */
 
-use std::env;
-use std::fs::File;
-use std::io::Write;
-
 use default_boxed::DefaultBoxed;
 use num_traits::{cast::FromPrimitive, float::Float};
+use std::{convert::TryInto, env, fs::File, io::Write};
 
 type F32 = f32;
 type F64 = f64;

diff --git a/tests/impulse-tests/archs/rust/architecture_osrnt.rs b/tests/impulse-tests/archs/rust/architecture_osrnt.rs
@@ -29,12 +29,9 @@ extern crate libm;
 extern crate num_traits;
 /* extern crate fastfloat; */
 
-use std::env;
-use std::fs::File;
-use std::io::Write;
-
 use default_boxed::DefaultBoxed;
 use num_traits::{cast::FromPrimitive, float::Float};
+use std::{convert::TryInto, env, fs::File, io::Write};
 
 type F32 = f32;
 type F64 = f64;

diff --git a/tests/impulse-tests/archs/rust/architecture_trait.rs b/tests/impulse-tests/archs/rust/architecture_trait.rs
@@ -29,11 +29,8 @@ extern crate libm;
 extern crate num_traits;
 /* extern crate fastfloat; */
 
-use std::env;
-use std::fs::File;
-use std::io::Write;
-
 use num_traits::{cast::FromPrimitive, float::Float};
+use std::{env, fs::File, io::Write};
 
 type F32 = f32;
 type F64 = f64;
@@ -178,10 +175,10 @@ impl<T: Float + FromPrimitive> UI<T> for ButtonUI {
     fn declare(&mut self, param: Option<ParamIndex>, key: &str, value: &str) {}
 }
 
-// Generated intrinsics:
+// // Generated intrinsics:
 <<includeIntrinsic>>
 
-// Generated class:
+// // Generated class:
 <<includeclass>>
 
 const SAMPLE_RATE: i32 = 44100;