Skip to content

Commit a6d043e

Browse files
committed
cargo fmt
1 parent 98ade0a commit a6d043e

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

script-gen-manager/src/instr_metadata/base_metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl BaseMetadata {
5757
pub const RATE_NORMAL: &'static str = "Normal";
5858
pub const RATE_FAST: &'static str = "Fast";
5959

60-
pub const UNDEFINED: &'static str = "UNDEFINED";
60+
pub const UNDEFINED: &'static str = "UNDEFINED";
6161

6262
pub const UNIT_VOLTS: &'static str = "V";
6363
pub const UNIT_AMPERES: &'static str = "A";

script-gen-manager/src/instr_metadata/msmu60_metadata.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::model::{
2-
chan_data::region_map::RegionMapMetadata,
3-
sweep_data::number_limit::NumberLimit,
2+
chan_data::region_map::RegionMapMetadata, sweep_data::number_limit::NumberLimit,
43
};
54

65
use super::base_metadata::{BaseMetadata, Metadata};

script-gen-manager/src/model/chan_data/start_stop_channel.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
use serde::{Deserialize, Serialize};
32

43
use super::default_channel::CommonChanAttributes;

script-gen-manager/src/script_component/sweep.rs

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
use std::{any::Any, collections::HashMap};
22

33
use crate::{
4-
device::DeviceType, instr_metadata::base_metadata::BaseMetadata, model::{
4+
device::DeviceType,
5+
instr_metadata::base_metadata::BaseMetadata,
6+
model::{
57
chan_data::channel_range::ChannelRange,
68
sweep_data::{
79
parameters::{ParameterFloat, ParameterString},
810
sweep_config::SweepConfig,
911
},
10-
}
12+
},
1113
};
1214

1315
use super::function::FunctionModel;
@@ -111,7 +113,9 @@ impl SweepModel {
111113
instr_name.clone() + ":MODEL-TYPE",
112114
bias_channel
113115
.common_chan_attributes
114-
.device.device_type.to_string(),
116+
.device
117+
.device_type
118+
.to_string(),
115119
);
116120

117121
let val = self
@@ -253,7 +257,9 @@ impl SweepModel {
253257
step_channel
254258
.start_stop_channel
255259
.common_chan_attributes
256-
.device.device_type.to_string(),
260+
.device
261+
.device_type
262+
.to_string(),
257263
);
258264

259265
let val = self
@@ -271,7 +277,8 @@ impl SweepModel {
271277
step_channel
272278
.start_stop_channel
273279
.common_chan_attributes
274-
.source_range.clone(),
280+
.source_range
281+
.clone(),
275282
&instr_name,
276283
);
277284

@@ -458,12 +465,14 @@ impl SweepModel {
458465
.get_model(),
459466
);
460467

461-
self.val_replacement_map.insert(
468+
self.val_replacement_map.insert(
462469
instr_name.clone() + ":MODEL-TYPE",
463470
sweep_channel
464471
.start_stop_channel
465472
.common_chan_attributes
466-
.device.device_type.to_string(),
473+
.device
474+
.device_type
475+
.to_string(),
467476
);
468477

469478
let val = self
@@ -481,7 +490,8 @@ impl SweepModel {
481490
sweep_channel
482491
.start_stop_channel
483492
.common_chan_attributes
484-
.source_range.clone(),
493+
.source_range
494+
.clone(),
485495
&instr_name,
486496
);
487497

0 commit comments

Comments
 (0)