diff --git a/Cargo.toml b/Cargo.toml index e8fc3312..c22e383e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-make" -version = "0.3.2" +version = "0.3.3" authors = ["Sagie Gur-Ari "] description = "Rust task runner and build tool." license = "Apache-2.0" diff --git a/README.md b/README.md index ecbc928b..af2479b1 100644 --- a/README.md +++ b/README.md @@ -634,7 +634,7 @@ See [contributing guide](.github/CONTRIBUTING.md) | Date | Version | Description | | ----------- | ------- | ----------- | -| 2017-07-03 | v0.3.2 | Fixed disabled not checked in platform override task | +| 2017-07-03 | v0.3.3 | Fixed disabled not checked in platform override task | | 2017-07-02 | v0.3.1 | Added CARGO_MAKE_TASK env var holding the main task name | | 2017-07-02 | v0.3.0 | Renamed few cli options | | 2017-07-02 | v0.2.20 | Added -v and --verbose cli arg | diff --git a/docs/_includes/content.md b/docs/_includes/content.md index 124379e1..184be32e 100644 --- a/docs/_includes/content.md +++ b/docs/_includes/content.md @@ -607,7 +607,7 @@ See [contributing guide](https://github.com/sagiegurari/cargo-make/blob/master/. | Date | Version | Description | | ----------- | ------- | ----------- | -| 2017-07-03 | v0.3.2 | Fixed disabled not checked in platform override task | +| 2017-07-03 | v0.3.3 | Fixed disabled not checked in platform override task | | 2017-07-02 | v0.3.1 | Added CARGO_MAKE_TASK env var holding the main task name | | 2017-07-02 | v0.3.0 | Renamed few cli options | | 2017-07-02 | v0.2.20 | Added -v and --verbose cli arg | diff --git a/docs/api/src/cargo_make/runner.rs.html b/docs/api/src/cargo_make/runner.rs.html index 8db223be..b32e41fb 100644 --- a/docs/api/src/cargo_make/runner.rs.html +++ b/docs/api/src/cargo_make/runner.rs.html @@ -210,11 +210,6 @@ 165 166 167 -168 -169 -170 -171 -172 
 //! # runner
 //!
@@ -305,18 +300,13 @@
             };
 
             if !task_names.contains(task) {
-                let mut add = !task_config.disabled.unwrap_or(false);
+                let mut clone_task = task_config.clone();
+                let normalized_task = clone_task.get_normalized_task();
+                let add = !normalized_task.disabled.unwrap_or(false);
 
                 if add {
-                    let mut clone_task = task_config.clone();
-                    let normalized_task = clone_task.get_normalized_task();
-
-                    add = !normalized_task.disabled.unwrap_or(false);
-
-                    if add {
-                        steps.push(Step { name: task.to_string(), config: normalized_task });
-                        task_names.insert(task.to_string());
-                    }
+                    steps.push(Step { name: task.to_string(), config: normalized_task });
+                    task_names.insert(task.to_string());
                 }
             } else if root {
                 logger.error::<()>("Circular reference found for task: ", &[&task], None);
diff --git a/src/runner.rs b/src/runner.rs
index b58cdcae..d9a1e073 100644
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -87,18 +87,13 @@ fn create_execution_plan_for_step(
             };
 
             if !task_names.contains(task) {
-                let mut add = !task_config.disabled.unwrap_or(false);
+                let mut clone_task = task_config.clone();
+                let normalized_task = clone_task.get_normalized_task();
+                let add = !normalized_task.disabled.unwrap_or(false);
 
                 if add {
-                    let mut clone_task = task_config.clone();
-                    let normalized_task = clone_task.get_normalized_task();
-
-                    add = !normalized_task.disabled.unwrap_or(false);
-
-                    if add {
-                        steps.push(Step { name: task.to_string(), config: normalized_task });
-                        task_names.insert(task.to_string());
-                    }
+                    steps.push(Step { name: task.to_string(), config: normalized_task });
+                    task_names.insert(task.to_string());
                 }
             } else if root {
                 logger.error::<()>("Circular reference found for task: ", &[&task], None);