diff --git a/src/crt0/src/lib.rs b/src/crt0/src/lib.rs index 9b2fe92627b9e80487e7637f2e2d1be3989bac11..c9f1a84c1e223ecc3120a154464989724644e3f2 100644 --- a/src/crt0/src/lib.rs +++ b/src/crt0/src/lib.rs @@ -89,7 +89,11 @@ pub unsafe extern "C" fn _start_rust(sp: &'static Stack) -> ! { platform::inner_environ.push(ptr::null_mut()); platform::environ = platform::inner_environ.as_mut_ptr(); - platform::exit(main(argc, argv as *const *const c_char, envp as *const *const c_char)); + platform::exit(main( + argc, + argv as *const *const c_char, + envp as *const *const c_char, + )); } #[panic_implementation] diff --git a/src/stdlib/src/lib.rs b/src/stdlib/src/lib.rs index e6445119aa85e2d2e94881788a8e477688086c28..d38986988adcd686a45b5b2888fad76d971c8430 100644 --- a/src/stdlib/src/lib.rs +++ b/src/stdlib/src/lib.rs @@ -264,7 +264,11 @@ unsafe fn find_env(name: *const c_char) -> Option<(usize, *mut c_char)> { for (i, item) in platform::inner_environ.iter().enumerate() { let mut item = *item; if item == ptr::null_mut() { - assert_eq!(i, platform::inner_environ.len() - 1, "an early null pointer in environ vector"); + assert_eq!( + i, + platform::inner_environ.len() - 1, + "an early null pointer in environ vector" + ); break; } let mut name = name; @@ -498,7 +502,11 @@ pub unsafe extern "C" fn putenv(s: *mut c_char) -> c_int { } else { ptr = platform::alloc(s_len as usize + 1) as *mut c_char; let i = platform::inner_environ.len() - 1; - assert_eq!(platform::inner_environ[i], ptr::null_mut(), "last element in environ vector was not null"); + assert_eq!( + platform::inner_environ[i], + ptr::null_mut(), + "last element in environ vector was not null" + ); platform::inner_environ[i] = ptr; platform::inner_environ.push(ptr::null_mut()); diff --git a/src/time/src/lib.rs b/src/time/src/lib.rs index aba3d2f71ec97acfb35a92d60409d6e1c53246fe..065cf792f54710aedf9fb1f3147083129b4186ba 100644 --- a/src/time/src/lib.rs +++ b/src/time/src/lib.rs @@ -341,7 +341,13 @@ pub unsafe extern "C" fn strftime( format: *const c_char, timeptr: *const tm, ) -> size_t { - strftime::strftime(true, &mut platform::UnsafeStringWriter(s as *mut u8), maxsize, format, timeptr) + strftime::strftime( + true, + &mut platform::UnsafeStringWriter(s as *mut u8), + maxsize, + format, + timeptr, + ) } // #[no_mangle] diff --git a/src/time/src/strftime.rs b/src/time/src/strftime.rs index 58741bf05991a37371684c89d8897a7656694ae0..8a7d78c83403159db7453e701b489801ca0b67de 100644 --- a/src/time/src/strftime.rs +++ b/src/time/src/strftime.rs @@ -1,9 +1,15 @@ use alloc::string::String; -use platform::Write; use platform::types::*; +use platform::Write; use tm; -pub unsafe fn strftime<W: Write>(toplevel: bool, mut w: &mut W, maxsize: usize, mut format: *const c_char, t: *const tm) -> size_t { +pub unsafe fn strftime<W: Write>( + toplevel: bool, + mut w: &mut W, + maxsize: usize, + mut format: *const c_char, + t: *const tm, +) -> size_t { let mut written = 0; if toplevel { // Reserve nul byte @@ -52,7 +58,7 @@ pub unsafe fn strftime<W: Write>(toplevel: bool, mut w: &mut W, maxsize: usize, "Wednesday", "Thursday", "Friday", - "Saturday" + "Saturday", ]; const MONTHS: [&'static str; 12] = [ "January", @@ -66,12 +72,12 @@ pub unsafe fn strftime<W: Write>(toplevel: bool, mut w: &mut W, maxsize: usize, "September", "October", "November", - "December" + "December", ]; while *format != 0 { if *format as u8 != b'%' { - w!(byte *format as u8); + w!(byte(*format as u8)); format = format.offset(1); continue; } @@ -98,7 +104,7 @@ pub unsafe fn strftime<W: Write>(toplevel: bool, mut w: &mut W, maxsize: usize, year += 1; } w!("{:02}", year + 19); - }, + } b'd' => w!("{:02}", (*t).tm_mday), b'D' => w!(recurse "%m/%d/%y"), b'e' => w!("{:2}", (*t).tm_mday), @@ -129,9 +135,9 @@ pub unsafe fn strftime<W: Write>(toplevel: bool, mut w: &mut W, maxsize: usize, b'y' => w!("{:02}", (*t).tm_year % 100), b'Y' => w!("{}", (*t).tm_year + 1900), b'z' => w!("+0000"), // TODO - b'Z' => w!("UTC"), // TODO + b'Z' => w!("UTC"), // TODO b'+' => w!(recurse "%a %b %d %T %Z %Y"), - _ => return 0 + _ => return 0, } format = format.offset(1);