From 11d2b2d4ef25a38cc141418bb66484c14ee25e22 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Mon, 22 Mar 2021 09:00:56 +0200
Subject: [PATCH] Avoid displaying unnecessary Cargo warning (fix #671) (#675)

if ~/.cargo/.crates.toml doesn't exists or is empty then the user did not install any applications using Cargo
---
 src/main.rs          |  2 +-
 src/steps/generic.rs | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 3462209b..ea745638 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -284,7 +284,7 @@ fn run() -> Result<()> {
     runner.execute(Step::Rustup, "rustup", || generic::run_rustup(&base_dirs, run_type))?;
     runner.execute(Step::Dotnet, ".NET", || generic::run_dotnet_upgrade(&ctx))?;
     runner.execute(Step::Choosenim, "choosenim", || generic::run_choosenim(&ctx))?;
-    runner.execute(Step::Cargo, "cargo", || generic::run_cargo_update(run_type))?;
+    runner.execute(Step::Cargo, "cargo", || generic::run_cargo_update(&ctx))?;
     runner.execute(Step::Flutter, "Flutter", || generic::run_flutter_upgrade(run_type))?;
     runner.execute(Step::Emacs, "Emacs", || emacs.upgrade(run_type))?;
     runner.execute(Step::Opam, "opam", || generic::run_opam_update(run_type))?;
diff --git a/src/steps/generic.rs b/src/steps/generic.rs
index 1ea5bb56..30e0bbff 100644
--- a/src/steps/generic.rs
+++ b/src/steps/generic.rs
@@ -10,14 +10,19 @@ use crate::{
 use anyhow::Result;
 use directories::BaseDirs;
 use log::debug;
-use std::io::Write;
 use std::path::PathBuf;
 use std::process::Command;
 use std::{env, path::Path};
+use std::{fs, io::Write};
 use tempfile::tempfile_in;
 
-pub fn run_cargo_update(run_type: RunType) -> Result<()> {
+pub fn run_cargo_update(ctx: &ExecutionContext) -> Result<()> {
     utils::require("cargo")?;
+    let toml_file = ctx.base_dirs().home_dir().join(".cargo/.crates.toml").require()?;
+
+    if fs::metadata(toml_file)?.len() == 0 {
+        return Err(SkipStep(String::from(".cargo/.crates.toml exists but empty")).into());
+    }
 
     print_separator("Cargo");
 
@@ -29,7 +34,7 @@ pub fn run_cargo_update(run_type: RunType) -> Result<()> {
         }
     };
 
-    run_type
+    ctx.run_type()
         .execute(cargo_update)
         .args(&["install-update", "--git", "--all"])
         .check_run()