From 0d0c18f519e44ab30d1b4d91dc2cd0f0b63d9275 Mon Sep 17 00:00:00 2001 From: Tamo Date: Wed, 11 Dec 2024 18:41:03 +0100 Subject: [PATCH] rename the Step::name into Step::current_step --- crates/index-scheduler/src/processing.rs | 18 +++++++++--------- crates/milli/src/progress.rs | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/index-scheduler/src/processing.rs b/crates/index-scheduler/src/processing.rs index 74802831e..aca654de9 100644 --- a/crates/index-scheduler/src/processing.rs +++ b/crates/index-scheduler/src/processing.rs @@ -215,7 +215,7 @@ mod test { { "steps": [ { - "name": "processing tasks", + "currentStep": "processing tasks", "finished": 0, "total": 2 } @@ -228,7 +228,7 @@ mod test { { "steps": [ { - "name": "writing tasks to disk", + "currentStep": "writing tasks to disk", "finished": 1, "total": 2 } @@ -248,12 +248,12 @@ mod test { { "steps": [ { - "name": "processing tasks", + "currentStep": "processing tasks", "finished": 0, "total": 2 }, { - "name": "task", + "currentStep": "task", "finished": 0, "total": 10 } @@ -266,12 +266,12 @@ mod test { { "steps": [ { - "name": "processing tasks", + "currentStep": "processing tasks", "finished": 0, "total": 2 }, { - "name": "task", + "currentStep": "task", "finished": 6, "total": 10 } @@ -284,7 +284,7 @@ mod test { { "steps": [ { - "name": "writing tasks to disk", + "currentStep": "writing tasks to disk", "finished": 1, "total": 2 } @@ -299,12 +299,12 @@ mod test { { "steps": [ { - "name": "writing tasks to disk", + "currentStep": "writing tasks to disk", "finished": 1, "total": 2 }, { - "name": "task", + "currentStep": "task", "finished": 4, "total": 5 } diff --git a/crates/milli/src/progress.rs b/crates/milli/src/progress.rs index d50be43cb..accc2cf56 100644 --- a/crates/milli/src/progress.rs +++ b/crates/milli/src/progress.rs @@ -39,7 +39,7 @@ impl Progress { percentage += step.current() as f32 / prev_factors; step_view.push(ProgressStepView { - name: step.name(), + current_step: step.name(), finished: step.current(), total: step.total(), }); @@ -146,7 +146,7 @@ pub struct ProgressView { #[derive(Debug, Serialize, Clone)] #[serde(rename_all = "camelCase")] pub struct ProgressStepView { - pub name: Cow<'static, str>, + pub current_step: Cow<'static, str>, pub finished: u32, pub total: u32, }