Skip to content

Commit 68f71a5

Browse files
Stabilize io_error_more
1 parent 3b1c8a9 commit 68f71a5

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

library/std/src/io/error.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ pub enum ErrorKind {
180180
#[stable(feature = "rust1", since = "1.0.0")]
181181
ConnectionReset,
182182
/// The remote host is not reachable.
183-
#[unstable(feature = "io_error_more", issue = "86442")]
183+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
184184
HostUnreachable,
185185
/// The network containing the remote host is not reachable.
186-
#[unstable(feature = "io_error_more", issue = "86442")]
186+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
187187
NetworkUnreachable,
188188
/// The connection was aborted (terminated) by the remote server.
189189
#[stable(feature = "rust1", since = "1.0.0")]
@@ -200,7 +200,7 @@ pub enum ErrorKind {
200200
#[stable(feature = "rust1", since = "1.0.0")]
201201
AddrNotAvailable,
202202
/// The system's networking is down.
203-
#[unstable(feature = "io_error_more", issue = "86442")]
203+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
204204
NetworkDown,
205205
/// The operation failed because a pipe was closed.
206206
#[stable(feature = "rust1", since = "1.0.0")]
@@ -216,18 +216,18 @@ pub enum ErrorKind {
216216
///
217217
/// For example, a filesystem path was specified where one of the intermediate directory
218218
/// components was, in fact, a plain file.
219-
#[unstable(feature = "io_error_more", issue = "86442")]
219+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
220220
NotADirectory,
221221
/// The filesystem object is, unexpectedly, a directory.
222222
///
223223
/// A directory was specified when a non-directory was expected.
224-
#[unstable(feature = "io_error_more", issue = "86442")]
224+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
225225
IsADirectory,
226226
/// A non-empty directory was specified where an empty directory was expected.
227-
#[unstable(feature = "io_error_more", issue = "86442")]
227+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
228228
DirectoryNotEmpty,
229229
/// The filesystem or storage medium is read-only, but a write operation was attempted.
230-
#[unstable(feature = "io_error_more", issue = "86442")]
230+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
231231
ReadOnlyFilesystem,
232232
/// Loop in the filesystem or IO subsystem; often, too many levels of symbolic links.
233233
///
@@ -236,13 +236,13 @@ pub enum ErrorKind {
236236
///
237237
/// On Unix this is usually the result of a symbolic link loop; or, of exceeding the
238238
/// system-specific limit on the depth of symlink traversal.
239-
#[unstable(feature = "io_error_more", issue = "86442")]
239+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
240240
FilesystemLoop,
241241
/// Stale network file handle.
242242
///
243243
/// With some network filesystems, notably NFS, an open file (or directory) can be invalidated
244244
/// by problems with the network or server.
245-
#[unstable(feature = "io_error_more", issue = "86442")]
245+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
246246
StaleNetworkFileHandle,
247247
/// A parameter was incorrect.
248248
#[stable(feature = "rust1", since = "1.0.0")]
@@ -276,57 +276,57 @@ pub enum ErrorKind {
276276
/// The underlying storage (typically, a filesystem) is full.
277277
///
278278
/// This does not include out of quota errors.
279-
#[unstable(feature = "io_error_more", issue = "86442")]
279+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
280280
StorageFull,
281281
/// Seek on unseekable file.
282282
///
283283
/// Seeking was attempted on an open file handle which is not suitable for seeking - for
284284
/// example, on Unix, a named pipe opened with `File::open`.
285-
#[unstable(feature = "io_error_more", issue = "86442")]
285+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
286286
NotSeekable,
287287
/// Filesystem quota was exceeded.
288-
#[unstable(feature = "io_error_more", issue = "86442")]
288+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
289289
FilesystemQuotaExceeded,
290290
/// File larger than allowed or supported.
291291
///
292292
/// This might arise from a hard limit of the underlying filesystem or file access API, or from
293293
/// an administratively imposed resource limitation. Simple disk full, and out of quota, have
294294
/// their own errors.
295-
#[unstable(feature = "io_error_more", issue = "86442")]
295+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
296296
FileTooLarge,
297297
/// Resource is busy.
298-
#[unstable(feature = "io_error_more", issue = "86442")]
298+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
299299
ResourceBusy,
300300
/// Executable file is busy.
301301
///
302302
/// An attempt was made to write to a file which is also in use as a running program. (Not all
303303
/// operating systems detect this situation.)
304-
#[unstable(feature = "io_error_more", issue = "86442")]
304+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
305305
ExecutableFileBusy,
306306
/// Deadlock (avoided).
307307
///
308308
/// A file locking operation would result in deadlock. This situation is typically detected, if
309309
/// at all, on a best-effort basis.
310-
#[unstable(feature = "io_error_more", issue = "86442")]
310+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
311311
Deadlock,
312312
/// Cross-device or cross-filesystem (hard) link or rename.
313-
#[unstable(feature = "io_error_more", issue = "86442")]
313+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
314314
CrossesDevices,
315315
/// Too many (hard) links to the same filesystem object.
316316
///
317317
/// The filesystem does not support making so many hardlinks to the same file.
318-
#[unstable(feature = "io_error_more", issue = "86442")]
318+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
319319
TooManyLinks,
320320
/// A filename was invalid.
321321
///
322322
/// This error can also cause if it exceeded the filename length limit.
323-
#[unstable(feature = "io_error_more", issue = "86442")]
323+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
324324
InvalidFilename,
325325
/// Program argument list too long.
326326
///
327327
/// When trying to run an external program, a system or process limit on the size of the
328328
/// arguments would have been exceeded.
329-
#[unstable(feature = "io_error_more", issue = "86442")]
329+
#[stable(feature = "io_error_more", since = "CURRENT_RUSTC_VERSION")]
330330
ArgumentListTooLong,
331331
/// This operation was interrupted.
332332
///

src/tools/miri/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![feature(map_try_insert)]
33
#![feature(never_type)]
44
#![feature(try_blocks)]
5-
#![feature(io_error_more)]
65
#![feature(variant_count)]
76
#![feature(yeet_expr)]
87
#![feature(is_some_and)]

src/tools/miri/tests/pass-dep/shims/libc-fs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ignore-target-windows: no libc on Windows
22
//@compile-flags: -Zmiri-disable-isolation
33

4-
#![feature(io_error_more)]
54
#![feature(io_error_uncategorized)]
65

76
use std::convert::TryInto;

src/tools/miri/tests/pass-dep/shims/libc-misc.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ignore-target-windows: No libc on Windows
22
//@compile-flags: -Zmiri-disable-isolation
3-
#![feature(io_error_more)]
43

54
use std::fs::{remove_file, File};
65
use std::os::unix::io::AsRawFd;

src/tools/miri/tests/pass/shims/fs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ignore-target-windows: File handling is not implemented yet
22
//@compile-flags: -Zmiri-disable-isolation
33

4-
#![feature(io_error_more)]
54
#![feature(io_error_uncategorized)]
65
#![feature(is_terminal)]
76

0 commit comments

Comments
 (0)