Skip to content

Commit 6af828a

Browse files
committed
Merge pull request #43 from jcmoyer/rust-master
Address io::io_error removal
2 parents 4f9818f + 8a045dc commit 6af828a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/codegen/keycode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ impl ToPrimitive for KeyCode {
330330
for primitive_type in types.iter() {
331331
out.write(format!("fn to_{}(&self) -> Option<{}> \\{
332332
Some(self.code() as {})
333-
\\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes())
333+
\\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes());
334334
}
335335

336336
out.write("

src/codegen/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn main() {
4242

4343
pub fn get_writer(output_dir: &Path, filename: &str) -> ~BufferedWriter<File> {
4444
match File::open_mode(&output_dir.join(filename), io::Truncate, io::Write) {
45-
Some(writer) => ~BufferedWriter::new(writer),
46-
None => fail!("Unable to write file"),
45+
Ok(writer) => ~BufferedWriter::new(writer),
46+
Err(e) => fail!("Unable to write file: {:s}", e.desc),
4747
}
4848
}

src/codegen/scancode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ impl ToPrimitive for ScanCode {
339339
for primitive_type in types.iter() {
340340
out.write(format!("fn to_{}(&self) -> Option<{}> \\{
341341
Some(self.code() as {})
342-
\\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes())
342+
\\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes());
343343
}
344344

345345
out.write("

0 commit comments

Comments
 (0)