extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-26 14:18:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove as many of the typecasts as possible in the cal command (#1886)

Browse Source 
* Remove as many of the typecasts as possible in the cal command

* Run rustfmt on cal.rs
This commit is contained in:
Joseph T. Lyons 2020-05-25 02:51:23 -04:00 committed by GitHub
parent c71510c65c
commit 07996ea93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-cli/src/commands/cal.rs
View File

@ -119,8 +119,8 @@ fn get_invalid_year_shell_error(year_tag: &Tag) -> ShellError {
} }
struct MonthHelper { struct MonthHelper {
day_number_month_starts_on: usize, day_number_month_starts_on: u32,
number_of_days_in_month: usize, number_of_days_in_month: u32,
selected_year: i32, selected_year: i32,
selected_month: u32, selected_month: u32,
} }
@ -169,8 +169,7 @@ impl MonthHelper {
match naive_date_result { match naive_date_result {
Ok(naive_date) => { Ok(naive_date) => {
self.day_number_month_starts_on = self.day_number_month_starts_on = naive_date.weekday().num_days_from_sunday();
naive_date.weekday().num_days_from_sunday() as usize;
Ok(()) Ok(())
} }
_ => Err(()), _ => Err(()),
@ -191,7 +190,7 @@ impl MonthHelper {
match naive_date_result { match naive_date_result {
Ok(naive_date) => { Ok(naive_date) => {
self.number_of_days_in_month = naive_date.pred().day() as usize; self.number_of_days_in_month = naive_date.pred().day();
Ok(()) Ok(())
} }
_ => Err(()), _ => Err(()),
@ -277,7 +276,7 @@ fn add_month_to_table(
}; };
let day_limit = month_helper.number_of_days_in_month + month_helper.day_number_month_starts_on; let day_limit = month_helper.number_of_days_in_month + month_helper.day_number_month_starts_on;
let mut day_count: usize = 1; let mut day_count: u32 = 1;
let days_of_the_week = [ let days_of_the_week = [
"sunday", "sunday",