diff --git a/Cargo.toml b/Cargo.toml index 856fe8c..3f6109d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ description = "Fast floating point to string conversion" repository = "https://github.com/dtolnay/ryu" documentation = "https://docs.rs/ryu" readme = "README.md" -build = "build.rs" edition = "2018" [features] diff --git a/build.rs b/build.rs index 7b639e7..f48477a 100644 --- a/build.rs +++ b/build.rs @@ -14,21 +14,12 @@ fn main() { let target = env::var("TARGET").unwrap(); let emscripten = target == "asmjs-unknown-emscripten" || target == "wasm32-unknown-emscripten"; - // 128-bit integers stabilized in Rust 1.26: - // https://blog.rust-lang.org/2018/05/10/Rust-1.26.html - // - // Disabled on Emscripten targets as Emscripten doesn't + // 128-bit integers disabled on Emscripten targets as Emscripten doesn't // currently support integers larger than 64 bits. - if minor >= 26 && !emscripten { + if !emscripten { println!("cargo:rustc-cfg=integer128"); } - // #[must_use] on functions stabilized in Rust 1.27: - // https://blog.rust-lang.org/2018/06/21/Rust-1.27.html - if minor >= 27 { - println!("cargo:rustc-cfg=must_use_return"); - } - // MaybeUninit stabilized in Rust 1.36: // https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html if minor >= 36 { @@ -37,30 +28,13 @@ fn main() { } fn rustc_minor_version() -> Option { - let rustc = match env::var_os("RUSTC") { - Some(rustc) => rustc, - None => return None, - }; - - let output = match Command::new(rustc).arg("--version").output() { - Ok(output) => output, - Err(_) => return None, - }; - - let version = match str::from_utf8(&output.stdout) { - Ok(version) => version, - Err(_) => return None, - }; - + let rustc = env::var_os("RUSTC")?; + let output = Command::new(rustc).arg("--version").output().ok()?; + let version = str::from_utf8(&output.stdout).ok()?; let mut pieces = version.split('.'); if pieces.next() != Some("rustc 1") { return None; } - - let next = match pieces.next() { - Some(next) => next, - None => return None, - }; - + let next = pieces.next()?; u32::from_str(next).ok() } diff --git a/src/pretty/mod.rs b/src/pretty/mod.rs index 5eed13c..a82692d 100644 --- a/src/pretty/mod.rs +++ b/src/pretty/mod.rs @@ -47,7 +47,7 @@ use no_panic::no_panic; /// assert_eq!(print, "1.234"); /// } /// ``` -#[cfg_attr(must_use_return, must_use)] +#[must_use] #[cfg_attr(feature = "no-panic", no_panic)] pub unsafe fn format64(f: f64, result: *mut u8) -> usize { let bits = mem::transmute::(f); @@ -154,7 +154,7 @@ pub unsafe fn format64(f: f64, result: *mut u8) -> usize { /// assert_eq!(print, "1.234"); /// } /// ``` -#[cfg_attr(must_use_return, must_use)] +#[must_use] #[cfg_attr(feature = "no-panic", no_panic)] pub unsafe fn format32(f: f32, result: *mut u8) -> usize { let bits = mem::transmute::(f);