Skip to content

Commit b296531

Browse files
committed
Auto merge of rust-lang#138416 - Manishearth:rollup-fejor9p, r=Manishearth
Rollup of 12 pull requests Successful merges: - rust-lang#134076 (Stabilize `std::io::ErrorKind::InvalidFilename`) - rust-lang#137504 (Move methods from Map to TyCtxt, part 4.) - rust-lang#138175 (Support rmeta inputs for --crate-type=bin --emit=obj) - rust-lang#138259 (Disentangle `ForwardGenericParamBan` and `ConstParamTy` ribs) - rust-lang#138280 (fix ICE in pretty-printing `global_asm!`) - rust-lang#138318 (Rustdoc: remove a bunch of `@ts-expect-error` from main.js) - rust-lang#138331 (Use `RUSTC_LINT_FLAGS` more) - rust-lang#138357 (merge `TypeChecker` and `TypeVerifier`) - rust-lang#138394 (remove unnecessary variant) - rust-lang#138403 (Delegation: one more ICE fix for `MethodCall` generation) - rust-lang#138407 (Delegation: reject C-variadics) - rust-lang#138409 (Use sa_sigaction instead of sa_union.__su_sigaction for AIX) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3e60295 + 68f6d81 commit b296531

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

std/src/io/error.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ pub enum ErrorKind {
373373
TooManyLinks,
374374
/// A filename was invalid.
375375
///
376-
/// This error can also cause if it exceeded the filename length limit.
377-
#[unstable(feature = "io_error_more", issue = "86442")]
376+
/// This error can also occur if a length limit for a name was exceeded.
377+
#[stable(feature = "io_error_invalid_filename", since = "CURRENT_RUSTC_VERSION")]
378378
InvalidFilename,
379379
/// Program argument list too long.
380380
///

0 commit comments

Comments
 (0)