Use std::io::Error::is_interrupted everywhere

saethlin · saethlin · commit 642251b71f83 · 2023-09-03T09:21:10.000-04:00
diff --git a/library/std/src/io/buffered/bufwriter.rs b/library/std/src/io/buffered/bufwriter.rs
@@ -237,7 +237,7 @@ impl<W: ?Sized + Write> BufWriter<W> {
                     ));
                 }
                 Ok(n) => guard.consume(n),
-                Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(ref e) if e.is_interrupted() => {}
                 Err(e) => return Err(e),
             }
         }
diff --git a/library/std/src/io/copy.rs b/library/std/src/io/copy.rs
@@ -1,4 +1,4 @@
-use super::{BorrowedBuf, BufReader, BufWriter, ErrorKind, Read, Result, Write, DEFAULT_BUF_SIZE};
+use super::{BorrowedBuf, BufReader, BufWriter, Read, Result, Write, DEFAULT_BUF_SIZE};
 use crate::alloc::Allocator;
 use crate::cmp;
 use crate::collections::VecDeque;
@@ -30,6 +30,7 @@ mod tests;
 ///
 /// [`read`]: Read::read
 /// [`write`]: Write::write
+/// [`ErrorKind::Interrupted`]: crate::io::ErrorKind::Interrupted
 ///
 /// # Examples
 ///
@@ -163,7 +164,7 @@ where
             // from adding I: Read
             match self.read(&mut []) {
                 Ok(_) => {}
-                Err(e) if e.kind() == ErrorKind::Interrupted => continue,
+                Err(e) if e.is_interrupted() => continue,
                 Err(e) => return Err(e),
             }
             let buf = self.buffer();
@@ -243,7 +244,7 @@ impl<I: Write + ?Sized> BufferedWriterSpec for BufWriter<I> {
                         // Read again if the buffer still has enough capacity, as BufWriter itself would do
                         // This will occur if the reader returns short reads
                     }
-                    Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+                    Err(ref e) if e.is_interrupted() => {}
                     Err(e) => return Err(e),
                 }
             } else {
@@ -275,7 +276,7 @@ impl<A: Allocator> BufferedWriterSpec for Vec<u8, A> {
             let mut buf: BorrowedBuf<'_> = self.spare_capacity_mut().into();
             match reader.read_buf(buf.unfilled()) {
                 Ok(()) => {}
-                Err(e) if e.kind() == ErrorKind::Interrupted => continue,
+                Err(e) if e.is_interrupted() => continue,
                 Err(e) => return Err(e),
             };
 
@@ -307,7 +308,7 @@ fn stack_buffer_copy<R: Read + ?Sized, W: Write + ?Sized>(
     loop {
         match reader.read_buf(buf.unfilled()) {
             Ok(()) => {}
-            Err(e) if e.kind() == ErrorKind::Interrupted => continue,
+            Err(e) if e.is_interrupted() => continue,
             Err(e) => return Err(e),
         };
 
diff --git a/library/std/src/io/mod.rs b/library/std/src/io/mod.rs
@@ -1647,7 +1647,7 @@ pub trait Write {
                     ));
                 }
                 Ok(n) => IoSlice::advance_slices(&mut bufs, n),
-                Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+                Err(ref e) if e.is_interrupted() => {}
                 Err(e) => return Err(e),
             }
         }
diff --git a/library/std/src/os/unix/fs.rs b/library/std/src/os/unix/fs.rs
@@ -123,7 +123,7 @@ pub trait FileExt {
                     buf = &mut tmp[n..];
                     offset += n as u64;
                 }
-                Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(ref e) if e.is_interrupted() => {}
                 Err(e) => return Err(e),
             }
         }
@@ -258,7 +258,7 @@ pub trait FileExt {
                     buf = &buf[n..];
                     offset += n as u64
                 }
-                Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(ref e) if e.is_interrupted() => {}
                 Err(e) => return Err(e),
             }
         }
diff --git a/library/std/src/os/wasi/fs.rs b/library/std/src/os/wasi/fs.rs
@@ -82,7 +82,7 @@ pub trait FileExt {
                     buf = &mut tmp[n..];
                     offset += n as u64;
                 }
-                Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(ref e) if e.is_interrupted() => {}
                 Err(e) => return Err(e),
             }
         }
@@ -162,7 +162,7 @@ pub trait FileExt {
                     buf = &buf[n..];
                     offset += n as u64
                 }
-                Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}
+                Err(ref e) if e.is_interrupted() => {}
                 Err(e) => return Err(e),
             }
         }
diff --git a/library/std/src/sys/hermit/mod.rs b/library/std/src/sys/hermit/mod.rs
@@ -196,7 +196,7 @@ where
 {
     loop {
         match cvt(f()) {
-            Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+            Err(ref e) if e.is_interrupted() => {}
             other => return other,
         }
     }
diff --git a/library/std/src/sys/hermit/net.rs b/library/std/src/sys/hermit/net.rs
@@ -108,7 +108,7 @@ impl Socket {
             match unsafe { netc::poll(&mut pollfd, 1, timeout) } {
                 -1 => {
                     let err = io::Error::last_os_error();
-                    if err.kind() != io::ErrorKind::Interrupted {
+                    if !err.is_interrupted() {
                         return Err(err);
                     }
                 }
diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
@@ -792,7 +792,7 @@ impl Drop for Dir {
     fn drop(&mut self) {
         let r = unsafe { libc::closedir(self.0) };
         assert!(
-            r == 0 || crate::io::Error::last_os_error().kind() == crate::io::ErrorKind::Interrupted,
+            r == 0 || crate::io::Error::last_os_error().is_interrupted(),
             "unexpected error during closedir: {:?}",
             crate::io::Error::last_os_error()
         );
diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs
@@ -320,7 +320,7 @@ where
 {
     loop {
         match cvt(f()) {
-            Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+            Err(ref e) if e.is_interrupted() => {}
             other => return other,
         }
     }
diff --git a/library/std/src/sys/unix/net.rs b/library/std/src/sys/unix/net.rs
@@ -184,7 +184,7 @@ impl Socket {
             match unsafe { libc::poll(&mut pollfd, 1, timeout) } {
                 -1 => {
                     let err = io::Error::last_os_error();
-                    if err.kind() != io::ErrorKind::Interrupted {
+                    if !err.is_interrupted() {
                         return Err(err);
                     }
                 }
diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs
@@ -165,7 +165,7 @@ impl Command {
                     assert!(p.wait().is_ok(), "wait() should either return Ok or panic");
                     return Err(Error::from_raw_os_error(errno));
                 }
-                Err(ref e) if e.kind() == ErrorKind::Interrupted => {}
+                Err(ref e) if e.is_interrupted() => {}
                 Err(e) => {
                     assert!(p.wait().is_ok(), "wait() should either return Ok or panic");
                     panic!("the CLOEXEC pipe failed: {e:?}")

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ impl<W: ?Sized + Write> BufWriter<W> {`
`237`	`237`	`));`
`238`	`238`	`}`
`239`	`239`	`Ok(n) => guard.consume(n),`
`240`		`- Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}`
	`240`	`+ Err(ref e) if e.is_interrupted() => {}`
`241`	`241`	`Err(e) => return Err(e),`
`242`	`242`	`}`
`243`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1647,7 +1647,7 @@ pub trait Write {`
`1647`	`1647`	`));`
`1648`	`1648`	`}`
`1649`	`1649`	`Ok(n) => IoSlice::advance_slices(&mut bufs, n),`
`1650`		`- Err(ref e) if e.kind() == ErrorKind::Interrupted => {}`
	`1650`	`+ Err(ref e) if e.is_interrupted() => {}`
`1651`	`1651`	`Err(e) => return Err(e),`
`1652`	`1652`	`}`
`1653`	`1653`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ pub trait FileExt {`
`123`	`123`	`buf = &mut tmp[n..];`
`124`	`124`	`offset += n as u64;`
`125`	`125`	`}`
`126`		`- Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}`
	`126`	`+ Err(ref e) if e.is_interrupted() => {}`
`127`	`127`	`Err(e) => return Err(e),`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -258,7 +258,7 @@ pub trait FileExt {`
`258`	`258`	`buf = &buf[n..];`
`259`	`259`	`offset += n as u64`
`260`	`260`	`}`
`261`		`- Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}`
	`261`	`+ Err(ref e) if e.is_interrupted() => {}`
`262`	`262`	`Err(e) => return Err(e),`
`263`	`263`	`}`
`264`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ pub trait FileExt {`
`82`	`82`	`buf = &mut tmp[n..];`
`83`	`83`	`offset += n as u64;`
`84`	`84`	`}`
`85`		`- Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}`
	`85`	`+ Err(ref e) if e.is_interrupted() => {}`
`86`	`86`	`Err(e) => return Err(e),`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -162,7 +162,7 @@ pub trait FileExt {`
`162`	`162`	`buf = &buf[n..];`
`163`	`163`	`offset += n as u64`
`164`	`164`	`}`
`165`		`- Err(ref e) if e.kind() == io::ErrorKind::Interrupted => {}`
	`165`	`+ Err(ref e) if e.is_interrupted() => {}`
`166`	`166`	`Err(e) => return Err(e),`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ where`
`196`	`196`	`{`
`197`	`197`	`loop {`
`198`	`198`	`match cvt(f()) {`
`199`		`- Err(ref e) if e.kind() == ErrorKind::Interrupted => {}`
	`199`	`+ Err(ref e) if e.is_interrupted() => {}`
`200`	`200`	`other => return other,`
`201`	`201`	`}`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ impl Socket {`
`108`	`108`	`match unsafe { netc::poll(&mut pollfd, 1, timeout) } {`
`109`	`109`	`-1 => {`
`110`	`110`	`let err = io::Error::last_os_error();`
`111`		`- if err.kind() != io::ErrorKind::Interrupted {`
	`111`	`+ if !err.is_interrupted() {`
`112`	`112`	`return Err(err);`
`113`	`113`	`}`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ where`
`320`	`320`	`{`
`321`	`321`	`loop {`
`322`	`322`	`match cvt(f()) {`
`323`		`- Err(ref e) if e.kind() == ErrorKind::Interrupted => {}`
	`323`	`+ Err(ref e) if e.is_interrupted() => {}`
`324`	`324`	`other => return other,`
`325`	`325`	`}`
`326`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ impl Socket {`
`184`	`184`	`match unsafe { libc::poll(&mut pollfd, 1, timeout) } {`
`185`	`185`	`-1 => {`
`186`	`186`	`let err = io::Error::last_os_error();`
`187`		`- if err.kind() != io::ErrorKind::Interrupted {`
	`187`	`+ if !err.is_interrupted() {`
`188`	`188`	`return Err(err);`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ impl Command {`
`165`	`165`	`assert!(p.wait().is_ok(), "wait() should either return Ok or panic");`
`166`	`166`	`return Err(Error::from_raw_os_error(errno));`
`167`	`167`	`}`
`168`		`- Err(ref e) if e.kind() == ErrorKind::Interrupted => {}`
	`168`	`+ Err(ref e) if e.is_interrupted() => {}`
`169`	`169`	`Err(e) => {`
`170`	`170`	`assert!(p.wait().is_ok(), "wait() should either return Ok or panic");`
`171`	`171`	`panic!("the CLOEXEC pipe failed: {e:?}")`