|
2 | 2 | // SPDX-License-Identifier: Apache-2.0 |
3 | 3 | // SPDX-License-Identifier: MIT |
4 | 4 |
|
5 | | -use crate::helpers::{ |
6 | | - config::get as get_config, framework::infer_from_package_json as infer_framework, |
| 5 | +use crate::{ |
| 6 | + helpers::{config::get as get_config, framework::infer_from_package_json as infer_framework}, |
| 7 | + interface::rust::get_workspace_dir, |
| 8 | + Result, |
7 | 9 | }; |
8 | | -use crate::Result; |
9 | 10 | use clap::Parser; |
10 | 11 | use colored::Colorize; |
11 | 12 | use serde::Deserialize; |
@@ -476,12 +477,12 @@ fn crate_version( |
476 | 477 | }; |
477 | 478 |
|
478 | 479 | let lock_version = match (lock, crate_lock_packages.is_empty()) { |
479 | | - (Some(_lock), true) => crate_lock_packages |
| 480 | + (Some(_lock), false) => crate_lock_packages |
480 | 481 | .iter() |
481 | 482 | .map(|p| p.version.clone()) |
482 | 483 | .collect::<Vec<String>>() |
483 | 484 | .join(", "), |
484 | | - (Some(_lock), false) => "unknown lockfile".to_string(), |
| 485 | + (Some(_lock), true) => "unknown lockfile".to_string(), |
485 | 486 | _ => "no lockfile".to_string(), |
486 | 487 | }; |
487 | 488 |
|
@@ -789,12 +790,13 @@ pub fn command(_options: Options) -> Result<()> { |
789 | 790 | } else { |
790 | 791 | None |
791 | 792 | }; |
792 | | - let lock: Option<CargoLock> = |
793 | | - if let Ok(lock_contents) = read_to_string(tauri_dir.join("Cargo.lock")) { |
794 | | - toml::from_str(&lock_contents).ok() |
795 | | - } else { |
796 | | - None |
797 | | - }; |
| 793 | + let lock: Option<CargoLock> = if let Ok(lock_contents) = |
| 794 | + read_to_string(get_workspace_dir(&tauri_dir).join("Cargo.lock")) |
| 795 | + { |
| 796 | + toml::from_str(&lock_contents).ok() |
| 797 | + } else { |
| 798 | + None |
| 799 | + }; |
798 | 800 |
|
799 | 801 | for (dep, label) in [ |
800 | 802 | ("tauri", format!("{} {}", "tauri", "[RUST]".dimmed())), |
|
0 commit comments