From b5a04a67fb439de5b1008b797f0f342bb0c8c4a8 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sun, 9 Oct 2016 18:53:06 +0200 Subject: [PATCH] Remove non-ASCII chars from canvas dependency Trying to fix an assertion on Windows in recent nightlies, blindy. --- components/gfx_traits/print_tree.rs | 14 +++++++------- components/util/opts.rs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/gfx_traits/print_tree.rs b/components/gfx_traits/print_tree.rs index 7a6ac4f0be9..1920ac6d581 100644 --- a/components/gfx_traits/print_tree.rs +++ b/components/gfx_traits/print_tree.rs @@ -15,7 +15,7 @@ pub struct PrintTree { impl PrintTree { pub fn new(title: String) -> PrintTree { - println!("┌ {}", title); + println!("\u{9484} {}", title); PrintTree { level: 1, queued_item: None, @@ -24,29 +24,29 @@ impl PrintTree { /// Descend one level in the tree with the given title. pub fn new_level(&mut self, title: String) { - self.flush_queued_item("├─"); + self.flush_queued_item("\u{9500}\u{9472}"); self.print_level_prefix(); - println!("├─ {}", title); + println!("\u{9500}\u{9472} {}", title); self.level = self.level + 1; } /// Ascend one level in the tree. pub fn end_level(&mut self) { - self.flush_queued_item("└─"); + self.flush_queued_item("\u{9492}\u{9472}"); self.level = self.level - 1; } /// Add an item to the current level in the tree. pub fn add_item(&mut self, text: String) { - self.flush_queued_item("├─"); + self.flush_queued_item("\u{9500}\u{9472}"); self.queued_item = Some(text); } fn print_level_prefix(&self) { for _ in 0..self.level { - print!("│ "); + print!("\u{9474} "); } } @@ -60,6 +60,6 @@ impl PrintTree { impl Drop for PrintTree { fn drop(&mut self) { - self.flush_queued_item("└─"); + self.flush_queued_item("\u{9492}\u{9472}"); } } diff --git a/components/util/opts.rs b/components/util/opts.rs index 8cc67c1d217..4df6ad853d9 100644 --- a/components/util/opts.rs +++ b/components/util/opts.rs @@ -791,9 +791,9 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult { let url = Url::from_file_path(&path).unwrap(); let mut contents = Vec::new(); File::open(path) - .unwrap_or_else(|err| args_fail(&format!("Couldn’t open {}: {}", filename, err))) + .unwrap_or_else(|err| args_fail(&format!("Couldn't open {}: {}", filename, err))) .read_to_end(&mut contents) - .unwrap_or_else(|err| args_fail(&format!("Couldn’t read {}: {}", filename, err))); + .unwrap_or_else(|err| args_fail(&format!("Couldn't read {}: {}", filename, err))); (contents, url) }).collect();