From e0794d0dff4507938dc7029b951e1e47f4331964 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Fri, 25 Nov 2022 13:02:01 -0800 Subject: [PATCH] Change `fallback` setting default to false (#1425) --- src/settings.rs | 19 +------------------ tests/fall_back_to_parent.rs | 15 ++++++++++++++- tests/json.rs | 30 +++++++++++++++--------------- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/settings.rs b/src/settings.rs index 95e97ee..5c3cc10 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -5,7 +5,7 @@ pub(crate) const DEFAULT_SHELL_ARGS: &[&str] = &["-cu"]; pub(crate) const WINDOWS_POWERSHELL_SHELL: &str = "powershell.exe"; pub(crate) const WINDOWS_POWERSHELL_ARGS: &[&str] = &["-NoLogo", "-Command"]; -#[derive(Debug, PartialEq, Serialize)] +#[derive(Debug, PartialEq, Serialize, Default)] pub(crate) struct Settings<'src> { pub(crate) allow_duplicate_recipes: bool, pub(crate) dotenv_load: Option, @@ -67,23 +67,6 @@ impl<'src> Settings<'src> { } } -impl<'src> Default for Settings<'src> { - fn default() -> Self { - Self { - allow_duplicate_recipes: false, - dotenv_load: None, - export: false, - fallback: true, - ignore_comments: false, - positional_arguments: false, - shell: None, - tempdir: None, - windows_powershell: false, - windows_shell: None, - } - } -} - #[cfg(test)] mod tests { use super::*; diff --git a/tests/fall_back_to_parent.rs b/tests/fall_back_to_parent.rs index db614ff..ea4771a 100644 --- a/tests/fall_back_to_parent.rs +++ b/tests/fall_back_to_parent.rs @@ -6,6 +6,8 @@ fn runs_recipe_in_parent_if_not_found_in_current() { .tree(tree! { bar: { justfile: " + set fallback := true + baz: echo subdir " @@ -68,6 +70,8 @@ fn print_error_from_parent_if_recipe_not_found_in_current() { .tree(tree! { bar: { justfile: " + set fallback := true + baz: echo subdir " @@ -145,6 +149,8 @@ fn works_with_provided_search_directory() { .tree(tree! { bar: { justfile: " + set fallback := true + baz: echo subdir " @@ -230,6 +236,8 @@ fn prints_correct_error_message_when_recipe_not_found() { .tree(tree! { bar: { justfile: " + set fallback := true + bar: echo subdir " @@ -261,11 +269,15 @@ fn multiple_levels_of_fallback_work() { a: { b: { justfile: " + set fallback := true + foo: echo subdir " }, justfile: " + set fallback := true + bar: echo subdir " @@ -298,12 +310,13 @@ fn stop_fallback_when_fallback_is_false() { a: { b: { justfile: " + set fallback := true + foo: echo subdir " }, justfile: " - set fallback := false bar: echo subdir " diff --git a/tests/json.rs b/tests/json.rs index 9f5eef6..6f418cb 100644 --- a/tests/json.rs +++ b/tests/json.rs @@ -43,7 +43,7 @@ fn alias() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "positional_arguments": false, "shell": null, "tempdir" : null, @@ -75,7 +75,7 @@ fn assignment() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -121,7 +121,7 @@ fn body() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -178,7 +178,7 @@ fn dependencies() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -272,7 +272,7 @@ fn dependency_argument() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -329,7 +329,7 @@ fn duplicate_recipes() { "allow_duplicate_recipes": true, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -368,7 +368,7 @@ fn doc_comment() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -394,7 +394,7 @@ fn empty_justfile() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -535,7 +535,7 @@ fn parameters() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -612,7 +612,7 @@ fn priors() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -651,7 +651,7 @@ fn private() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -690,7 +690,7 @@ fn quiet() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -793,7 +793,7 @@ fn shebang() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -832,7 +832,7 @@ fn simple() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "ignore_comments": false, "positional_arguments": false, "shell": null, @@ -874,7 +874,7 @@ fn attribute() { "allow_duplicate_recipes": false, "dotenv_load": null, "export": false, - "fallback": true, + "fallback": false, "positional_arguments": false, "shell": null, "tempdir" : null,