]> git.lizzy.rs Git - rust.git/commitdiff
Fix merge conflict with recent PR
authorAlexis Bourget <alexis.bourget@gmail.com>
Sun, 19 Jul 2020 20:15:44 +0000 (22:15 +0200)
committerAlexis Bourget <alexis.bourget@gmail.com>
Sun, 19 Jul 2020 20:15:44 +0000 (22:15 +0200)
1  2 
src/libstd/io/mod.rs

index 73a6f08df65fd3ed8cea839aa519d0b702f77cba,823ce30febed425ac794e6e1440a203b43029edb..797318d95b7775f3d5e13011acc9401da7cfb1ee
@@@ -766,10 -745,7 +747,8 @@@ pub trait Read 
      ///
      /// [`File`]s implement `Read`:
      ///
-     /// [`File`]: ../fs/struct.File.html
-     /// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
-     /// [`ErrorKind::UnexpectedEof`]: ../../std/io/enum.ErrorKind.html#variant.UnexpectedEof
 +    /// [`read`]: Read::read
+     /// [`File`]: crate::fs::File
      ///
      /// ```no_run
      /// use std::io;