Hide emoji on Windows.

Closes #1122.
This commit is contained in:
Alex Macleod 2020-04-14 13:28:36 +01:00 committed by Sergio Benitez
parent a8b029e423
commit ca4d1572d4
3 changed files with 22 additions and 5 deletions

View File

@ -1,5 +1,6 @@
use crate::{Rocket, Request, Response, Data}; use crate::{Rocket, Request, Response, Data};
use crate::fairing::{Fairing, Kind}; use crate::fairing::{Fairing, Kind};
use crate::logger::PaintExt;
use yansi::Paint; use yansi::Paint;
@ -93,7 +94,7 @@ impl Fairings {
pub fn pretty_print_counts(&self) { pub fn pretty_print_counts(&self) {
if !self.all_fairings.is_empty() { if !self.all_fairings.is_empty() {
info!("{}{}:", Paint::masked("📡 "), Paint::magenta("Fairings")); info!("{}{}:", Paint::emoji("📡 "), Paint::magenta("Fairings"));
self.info_for("launch", &self.launch); self.info_for("launch", &self.launch);
self.info_for("request", &self.request); self.info_for("request", &self.request);
self.info_for("response", &self.response); self.info_for("response", &self.response);

View File

@ -210,6 +210,21 @@ pub(crate) fn pop_max_level() {
} }
} }
pub(crate) trait PaintExt {
fn emoji(item: &str) -> Paint<&str>;
}
impl PaintExt for Paint<&str> {
/// Paint::masked(), but hidden on Windows due to broken output. See #1122.
fn emoji(item: &str) -> Paint<&str> {
if cfg!(windows) {
Paint::masked("")
} else {
Paint::masked(item)
}
}
}
#[doc(hidden)] #[doc(hidden)]
pub fn init(level: LoggingLevel) -> bool { pub fn init(level: LoggingLevel) -> bool {
try_init(level, true) try_init(level, true)

View File

@ -21,6 +21,7 @@ use crate::catcher::{self, Catcher};
use crate::outcome::Outcome; use crate::outcome::Outcome;
use crate::error::{LaunchError, LaunchErrorKind}; use crate::error::{LaunchError, LaunchErrorKind};
use crate::fairing::{Fairing, Fairings}; use crate::fairing::{Fairing, Fairings};
use crate::logger::PaintExt;
use crate::http::{Method, Status, Header}; use crate::http::{Method, Status, Header};
use crate::http::hyper::{self, header}; use crate::http::hyper::{self, header};
@ -403,7 +404,7 @@ impl Rocket {
logger::push_max_level(logger::LoggingLevel::Normal); logger::push_max_level(logger::LoggingLevel::Normal);
} }
launch_info!("{}Configured for {}.", Paint::masked("🔧 "), config.environment); launch_info!("{}Configured for {}.", Paint::emoji("🔧 "), config.environment);
launch_info_!("address: {}", Paint::default(&config.address).bold()); launch_info_!("address: {}", Paint::default(&config.address).bold());
launch_info_!("port: {}", Paint::default(&config.port).bold()); launch_info_!("port: {}", Paint::default(&config.port).bold());
launch_info_!("log: {}", Paint::default(config.log_level).bold()); launch_info_!("log: {}", Paint::default(config.log_level).bold());
@ -503,7 +504,7 @@ impl Rocket {
#[inline] #[inline]
pub fn mount<R: Into<Vec<Route>>>(mut self, base: &str, routes: R) -> Self { pub fn mount<R: Into<Vec<Route>>>(mut self, base: &str, routes: R) -> Self {
info!("{}{} {}{}", info!("{}{} {}{}",
Paint::masked("🛰 "), Paint::emoji("🛰 "),
Paint::magenta("Mounting"), Paint::magenta("Mounting"),
Paint::blue(base), Paint::blue(base),
Paint::magenta(":")); Paint::magenta(":"));
@ -562,7 +563,7 @@ impl Rocket {
/// ``` /// ```
#[inline] #[inline]
pub fn register(mut self, catchers: Vec<Catcher>) -> Self { pub fn register(mut self, catchers: Vec<Catcher>) -> Self {
info!("{}{}", Paint::masked("👾 "), Paint::magenta("Catchers:")); info!("{}{}", Paint::emoji("👾 "), Paint::magenta("Catchers:"));
for c in catchers { for c in catchers {
if self.catchers.get(&c.code).map_or(false, |e| !e.is_default) { if self.catchers.get(&c.code).map_or(false, |e| !e.is_default) {
info_!("{} {}", c, Paint::yellow("(warning: duplicate catcher!)")); info_!("{} {}", c, Paint::yellow("(warning: duplicate catcher!)"));
@ -721,7 +722,7 @@ impl Rocket {
let full_addr = format!("{}:{}", self.config.address, self.config.port); let full_addr = format!("{}:{}", self.config.address, self.config.port);
launch_info!("{}{} {}{}", launch_info!("{}{} {}{}",
Paint::masked("🚀 "), Paint::emoji("🚀 "),
Paint::default("Rocket has launched from").bold(), Paint::default("Rocket has launched from").bold(),
Paint::default(proto).bold().underline(), Paint::default(proto).bold().underline(),
Paint::default(&full_addr).bold().underline()); Paint::default(&full_addr).bold().underline());