fix specifying a version with use or install in a folder with a v…

…ersion file
beeequeue · Jul 6, 2022 · fed55b4 · fed55b4
1 parent 840000f
commit fed55b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/subcommand/install.rs b/src/subcommand/install.rs
@@ -32,7 +32,7 @@ impl Action<InstallCommand> for InstallCommand {
         let version_filter = options
             .version
             .clone()
-            .xor(files::get_version_file().map(|version_file| version_file.range()));
+            .or_else(|| files::get_version_file().map(|version_file| version_file.range()));
 
         if version_filter.is_none() {
             anyhow::bail!("You did not pass a version and we did not find any version files (package.json#engines, .nvmrc) in the current directory.");

diff --git a/src/subcommand/switch.rs b/src/subcommand/switch.rs
@@ -37,7 +37,7 @@ impl Action<SwitchCommand> for SwitchCommand {
         let version_filter = options
             .clone()
             .version
-            .xor(files::get_version_file().map(|version_file| version_file.range()));
+            .or_else(|| files::get_version_file().map(|version_file| version_file.range()));
 
         if version_filter.is_none() {
             anyhow::bail!("You did not pass a version and we did not find any version files (package.json#engines, .nvmrc) in the current directory.");