diff --git a/src/cli.rs b/src/cli.rs index 0a3fb14..ad7f138 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1,6 +1,6 @@ use structopt::StructOpt; -use crate::{temp_unit::TempUnit, speed_unit::SpeedUnit, data_format::DataFormat}; +use crate::{data_format::DataFormat, speed_unit::SpeedUnit, temp_unit::TempUnit}; #[derive(Debug, StructOpt)] #[structopt( @@ -34,14 +34,12 @@ pub enum Arguments { is_day: bool, #[structopt(short = "t", long, help = "Displays the decimal temperature")] temperature: bool, - #[structopt(long, - possible_values = &TempUnit::variants(), default_value = "Celsius" , case_insensitive = true, + #[structopt(long, possible_values = &TempUnit::variants(), default_value = "Celsius" , case_insensitive = true, help = "Switches between Celsius or Fahrenheit")] temperature_unit: TempUnit, #[structopt(short = "w", long, help = "Displays the decimal wind speed")] windspeed: bool, - #[structopt(long, - possible_values = &SpeedUnit::variants(), default_value = "Kmh" , case_insensitive = true, + #[structopt(long, possible_values = &SpeedUnit::variants(), default_value = "Kmh" , case_insensitive = true, help = "Switches between km/h, m/s, mp/h or knots")] speed_unit: SpeedUnit, #[structopt(short = "W", long, help = "Displays the wind direction, in degrees")] @@ -50,12 +48,11 @@ pub enum Arguments { include_coords: bool, #[structopt(long = "city", help = "Displays the city")] include_city: bool, - - #[structopt(long, - possible_values = &DataFormat::variants(), default_value = "Normal" , case_insensitive = true, + + #[structopt(long, possible_values = &DataFormat::variants(), default_value = "Normal" , case_insensitive = true, help = "Switches data format between Normal, Clean or JSON")] format: DataFormat, - + #[structopt( short = "c", long,