Merge branch 'main' of github.com:o2sh/onefetch

Author: o2sh

Cargo.lock

@@ -30,7 +30,7 @@ anyhow = "1.0"
 askalono = "0.4.4"
 byte-unit = "4.0.13"
 bytecount = "0.6.2"
-clap = {version = "3.0.14", features = ["cargo", "wrap_help"]}
+clap = {version = "3.1.1", features = ["cargo", "wrap_help"]}
 color_quant = "1.1.0"
 colored = "2.0.0"
 git2 = {version = "0.13.25", default-features = false}

Cargo.toml

@@ -5,7 +5,7 @@ use crate::ui::image_backends;
 use crate::ui::image_backends::ImageBackend;
 use crate::ui::printer::SerializationFormat;
 use anyhow::{Context, Result};
-use clap::{crate_description, crate_name, crate_version, App, AppSettings, Arg};
+use clap::{crate_description, crate_name, crate_version, AppSettings, Arg};
 use image::DynamicImage;
 use regex::Regex;
 use std::process::Command;
@@ -48,11 +48,11 @@ impl Config {
         let color_values = &[
             "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15",
         ];
-        let matches = App::new(crate_name!())
+        let matches = clap::Command::new(crate_name!())
         .version(crate_version!())
         .about(crate_description!())
         .setting(AppSettings::DeriveDisplayOrder)
-        .setting(AppSettings::HidePossibleValues)
+        .hide_possible_values(true)
         .arg(
             Arg::new("input")
             .default_value(".")