Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Rust 1.14.0-nightly (19ac57926 2016-10-08) #13649

Merged
merged 2 commits into from Oct 10, 2016
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Remove non-ASCII chars from canvas dependency

Trying to fix an assertion on Windows in recent nightlies, blindy.
  • Loading branch information
nox committed Oct 9, 2016
commit b5a04a67fb439de5b1008b797f0f342bb0c8c4a8
@@ -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}");
}
}
@@ -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!("Couldnt 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!("Couldnt read {}: {}", filename, err)));
.unwrap_or_else(|err| args_fail(&format!("Couldn't read {}: {}", filename, err)));
(contents, url)
}).collect();

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.