Skip to content

Commit 2a1cfd4

Browse files
committed
refactor(lib): remove unecessary nesting
1 parent 7f69371 commit 2a1cfd4

File tree

2 files changed

+34
-45
lines changed

2 files changed

+34
-45
lines changed

src/pipeline/mod.rs

Lines changed: 28 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,10 +1119,8 @@ pub fn apply_ops_internal(
11191119
let mut default_sep = " ".to_string();
11201120
let start_time = if debug { Some(Instant::now()) } else { None };
11211121

1122-
if debug {
1123-
if let Some(ref tracer) = debug_tracer {
1124-
tracer.pipeline_start(ops, &val);
1125-
}
1122+
if debug && let Some(ref tracer) = debug_tracer {
1123+
tracer.pipeline_start(ops, &val);
11261124
}
11271125

11281126
for (i, op) in ops.iter().enumerate() {
@@ -1131,28 +1129,24 @@ pub fn apply_ops_internal(
11311129

11321130
match op {
11331131
StringOp::Map { operations } => {
1134-
if debug {
1135-
if let Some(ref tracer) = debug_tracer {
1136-
tracer.operation_step(
1137-
i + 1,
1138-
ops.len(),
1139-
op,
1140-
&input_val,
1141-
&Value::Str("processing...".to_string()),
1142-
Duration::from_nanos(0),
1143-
);
1144-
}
1132+
if debug && let Some(ref tracer) = debug_tracer {
1133+
tracer.operation_step(
1134+
i + 1,
1135+
ops.len(),
1136+
op,
1137+
&input_val,
1138+
&Value::Str("processing...".to_string()),
1139+
Duration::from_nanos(0),
1140+
);
11451141
}
11461142

11471143
if let Value::List(list) = val {
11481144
let mapped = list
11491145
.iter()
11501146
.enumerate()
11511147
.map(|(item_idx, item)| {
1152-
if debug {
1153-
if let Some(ref tracer) = debug_tracer {
1154-
tracer.map_item_start(item_idx + 1, list.len(), item);
1155-
}
1148+
if debug && let Some(ref tracer) = debug_tracer {
1149+
tracer.map_item_start(item_idx + 1, list.len(), item);
11561150
}
11571151

11581152
let sub_tracer = DebugTracer::sub_pipeline(debug);
@@ -1163,23 +1157,19 @@ pub fn apply_ops_internal(
11631157
Some(sub_tracer),
11641158
);
11651159

1166-
if debug {
1167-
if let Some(ref tracer) = debug_tracer {
1168-
match &result {
1169-
Ok(output) => tracer.map_item_end(Ok(output)),
1170-
Err(e) => tracer.map_item_end(Err(e)),
1171-
}
1160+
if debug && let Some(ref tracer) = debug_tracer {
1161+
match &result {
1162+
Ok(output) => tracer.map_item_end(Ok(output)),
1163+
Err(e) => tracer.map_item_end(Err(e)),
11721164
}
11731165
}
11741166

11751167
result
11761168
})
11771169
.collect::<Result<Vec<_>, _>>()?;
11781170

1179-
if debug {
1180-
if let Some(ref tracer) = debug_tracer {
1181-
tracer.map_complete(list.len(), mapped.len());
1182-
}
1171+
if debug && let Some(ref tracer) = debug_tracer {
1172+
tracer.map_complete(list.len(), mapped.len());
11831173
}
11841174

11851175
val = Value::List(mapped);
@@ -1194,19 +1184,18 @@ pub fn apply_ops_internal(
11941184
}
11951185
}
11961186

1197-
if debug && !matches!(op, StringOp::Map { .. }) {
1198-
if let Some(ref tracer) = debug_tracer {
1199-
let elapsed = step_start.unwrap().elapsed();
1200-
tracer.operation_step(i + 1, ops.len(), op, &input_val, &val, elapsed);
1201-
}
1187+
if debug
1188+
&& !matches!(op, StringOp::Map { .. })
1189+
&& let Some(ref tracer) = debug_tracer
1190+
{
1191+
let elapsed = step_start.unwrap().elapsed();
1192+
tracer.operation_step(i + 1, ops.len(), op, &input_val, &val, elapsed);
12021193
}
12031194
}
12041195

1205-
if debug {
1206-
if let Some(ref tracer) = debug_tracer {
1207-
let total_elapsed = start_time.unwrap().elapsed();
1208-
tracer.pipeline_end(&val, total_elapsed);
1209-
}
1196+
if debug && let Some(ref tracer) = debug_tracer {
1197+
let total_elapsed = start_time.unwrap().elapsed();
1198+
tracer.pipeline_end(&val, total_elapsed);
12101199
}
12111200

12121201
Ok(match val {

src/pipeline/template.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -517,13 +517,13 @@ impl MultiTemplate {
517517
dbg: &Option<&DebugTracer>,
518518
) -> Result<String, String> {
519519
/* fast path: single split --------------------------------------- */
520-
if ops.len() == 1 {
521-
if let StringOp::Split { sep, range } = &ops[0] {
522-
if let Some(t) = dbg {
523-
t.cache_operation("FAST SPLIT", &format!("by '{sep}'"));
524-
}
525-
return Ok(self.fast_single_split(input, sep, range));
520+
if ops.len() == 1
521+
&& let StringOp::Split { sep, range } = &ops[0]
522+
{
523+
if let Some(t) = dbg {
524+
t.cache_operation("FAST SPLIT", &format!("by '{sep}'"));
526525
}
526+
return Ok(self.fast_single_split(input, sep, range));
527527
}
528528

529529
/* general path – memoised per call ------------------------------ */

0 commit comments

Comments
 (0)