From e3a8ea4e18a50da60036d2731768a9cb78c90f5a Mon Sep 17 00:00:00 2001 From: varkor Date: Tue, 8 Oct 2019 01:14:42 +0100 Subject: Use `to_option` in various places --- src/libsyntax_ext/format_foreign.rs | 6 +++--- src/libsyntax_ext/lib.rs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/libsyntax_ext') diff --git a/src/libsyntax_ext/format_foreign.rs b/src/libsyntax_ext/format_foreign.rs index 3d4f8276441..f6e8b086532 100644 --- a/src/libsyntax_ext/format_foreign.rs +++ b/src/libsyntax_ext/format_foreign.rs @@ -95,12 +95,12 @@ pub mod printf { }; // Has a special form in Rust for numbers. - let fill = if c_zero { Some("0") } else { None }; + let fill = c_zero.to_option("0"); - let align = if c_left { Some("<") } else { None }; + let align = c_left.to_option("<"); // Rust doesn't have an equivalent to the `' '` flag. - let sign = if c_plus { Some("+") } else { None }; + let sign = c_plus.to_option("+"); // Not *quite* the same, depending on the type... let alt = c_alt; diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs index b9287d2fe70..55c7f3fa574 100644 --- a/src/libsyntax_ext/lib.rs +++ b/src/libsyntax_ext/lib.rs @@ -3,6 +3,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] +#![feature(bool_to_option)] #![feature(crate_visibility_modifier)] #![feature(decl_macro)] #![feature(nll)] -- cgit 1.4.1-3-g733a5