Test fixes and rebase conflicts, round 1
This commit is contained in:
parent
19cd00094c
commit
efaef24304
@ -183,6 +183,7 @@ impl File {
|
||||
///
|
||||
/// ```no_run
|
||||
/// use std::fs::File;
|
||||
/// use std::io::prelude::*;
|
||||
///
|
||||
/// # fn foo() -> std::io::Result<()> {
|
||||
/// let mut f = try!(File::create("foo.txt"));
|
||||
@ -211,6 +212,7 @@ impl File {
|
||||
///
|
||||
/// ```no_run
|
||||
/// use std::fs::File;
|
||||
/// use std::io::prelude::*;
|
||||
///
|
||||
/// # fn foo() -> std::io::Result<()> {
|
||||
/// let mut f = try!(File::create("foo.txt"));
|
||||
|
Loading…
x
Reference in New Issue
Block a user