Remove non-ASCII chars from canvas dependency

Trying to fix an assertion on Windows in recent nightlies, blindy.
This commit is contained in:
Anthony Ramine 2016-10-09 18:53:06 +02:00
parent 70dbfd28fa
commit b5a04a67fb
2 changed files with 9 additions and 9 deletions

View file

@ -15,7 +15,7 @@ pub struct PrintTree {
impl PrintTree { impl PrintTree {
pub fn new(title: String) -> PrintTree { pub fn new(title: String) -> PrintTree {
println!(" {}", title); println!("\u{9484} {}", title);
PrintTree { PrintTree {
level: 1, level: 1,
queued_item: None, queued_item: None,
@ -24,29 +24,29 @@ impl PrintTree {
/// Descend one level in the tree with the given title. /// Descend one level in the tree with the given title.
pub fn new_level(&mut self, title: String) { pub fn new_level(&mut self, title: String) {
self.flush_queued_item("├─"); self.flush_queued_item("\u{9500}\u{9472}");
self.print_level_prefix(); self.print_level_prefix();
println!("├─ {}", title); println!("\u{9500}\u{9472} {}", title);
self.level = self.level + 1; self.level = self.level + 1;
} }
/// Ascend one level in the tree. /// Ascend one level in the tree.
pub fn end_level(&mut self) { pub fn end_level(&mut self) {
self.flush_queued_item("└─"); self.flush_queued_item("\u{9492}\u{9472}");
self.level = self.level - 1; self.level = self.level - 1;
} }
/// Add an item to the current level in the tree. /// Add an item to the current level in the tree.
pub fn add_item(&mut self, text: String) { 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); self.queued_item = Some(text);
} }
fn print_level_prefix(&self) { fn print_level_prefix(&self) {
for _ in 0..self.level { for _ in 0..self.level {
print!(" "); print!("\u{9474} ");
} }
} }
@ -60,6 +60,6 @@ impl PrintTree {
impl Drop for PrintTree { impl Drop for PrintTree {
fn drop(&mut self) { fn drop(&mut self) {
self.flush_queued_item("└─"); self.flush_queued_item("\u{9492}\u{9472}");
} }
} }

View file

@ -791,9 +791,9 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
let url = Url::from_file_path(&path).unwrap(); let url = Url::from_file_path(&path).unwrap();
let mut contents = Vec::new(); let mut contents = Vec::new();
File::open(path) File::open(path)
.unwrap_or_else(|err| args_fail(&format!("Couldnt open {}: {}", filename, err))) .unwrap_or_else(|err| args_fail(&format!("Couldn't open {}: {}", filename, err)))
.read_to_end(&mut contents) .read_to_end(&mut contents)
.unwrap_or_else(|err| args_fail(&format!("Couldnt read {}: {}", filename, err))); .unwrap_or_else(|err| args_fail(&format!("Couldn't read {}: {}", filename, err)));
(contents, url) (contents, url)
}).collect(); }).collect();