From: Alexis Bourget <alexis.bourget@gmail.com>
Date: Sun, 19 Jul 2020 20:15:44 +0000 (+0200)
Subject: Fix merge conflict with recent PR
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=471dd52d7710dcad5fec0cd731b836b02ba4a8f4;p=rust.git

Fix merge conflict with recent PR
---

471dd52d7710dcad5fec0cd731b836b02ba4a8f4
diff --cc src/libstd/io/mod.rs
index 73a6f08df65,823ce30febe..797318d95b7
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@@ -766,10 -745,7 +747,8 @@@ pub trait Read 
      ///
      /// [`File`]s implement `Read`:
      ///
 +    /// [`read`]: Read::read
-     /// [`File`]: ../fs/struct.File.html
-     /// [`ErrorKind::Interrupted`]: ../../std/io/enum.ErrorKind.html#variant.Interrupted
-     /// [`ErrorKind::UnexpectedEof`]: ../../std/io/enum.ErrorKind.html#variant.UnexpectedEof
+     /// [`File`]: crate::fs::File
      ///
      /// ```no_run
      /// use std::io;