Skip to content

Commit 158340f

Browse files
authored
Rollup merge of #141311 - folkertdev:tidy-natural-sort, r=jieyouxu
make `tidy-alphabetical` use a natural sort The idea here is that these lines should be correctly sorted, even though a naive string comparison would say they are not: ``` foo2 foo10 ``` This is the ["natural sort order"](https://en.wikipedia.org/wiki/Natural_sort_order). There is more discussion in [#t-compiler/help > tidy natural sort](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/tidy.20natural.20sort/with/519111079) Unfortunately, no standard sorting tools are smart enough to to this automatically (casting some doubt on whether we should make this change). Here are some sort outputs: ``` > cat foo.txt | sort foo foo1 foo10 foo2 mp mp1e2 np", np1e2", > cat foo.txt | sort -n foo foo1 foo10 foo2 mp mp1e2 np", np1e2", > cat foo.txt | sort -V foo foo1 foo2 foo10 mp mp1e2 np1e2", np", ``` Disappointingly, "numeric" sort does not actually have the behavior we want. It only sorts by numeric value if the line starts with a number. The "version" sort looks promising, but does something very unintuitive if you look at the final 4 values. None of the other options seem to have the desired behavior in all cases: ``` -b, --ignore-leading-blanks ignore leading blanks -d, --dictionary-order consider only blanks and alphanumeric characters -f, --ignore-case fold lower case to upper case characters -g, --general-numeric-sort compare according to general numerical value -i, --ignore-nonprinting consider only printable characters -M, --month-sort compare (unknown) < 'JAN' < ... < 'DEC' -h, --human-numeric-sort compare human readable numbers (e.g., 2K 1G) -n, --numeric-sort compare according to string numerical value -R, --random-sort shuffle, but group identical keys. See shuf(1) --random-source=FILE get random bytes from FILE -r, --reverse reverse the result of comparisons --sort=WORD sort according to WORD: general-numeric -g, human-numeric -h, month -M, numeric -n, random -R, version -V -V, --version-sort natural sort of (version) numbers within text ``` r? ```@Noratrieb``` (it sounded like you know this code?)
2 parents d5d5eb4 + 1dfc840 commit 158340f

File tree

19 files changed

+260
-58
lines changed

19 files changed

+260
-58
lines changed

compiler/rustc_ast/src/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4064,9 +4064,9 @@ mod size_asserts {
40644064
static_assert_size!(MetaItemLit, 40);
40654065
static_assert_size!(Param, 40);
40664066
static_assert_size!(Pat, 72);
4067+
static_assert_size!(PatKind, 48);
40674068
static_assert_size!(Path, 24);
40684069
static_assert_size!(PathSegment, 24);
4069-
static_assert_size!(PatKind, 48);
40704070
static_assert_size!(Stmt, 32);
40714071
static_assert_size!(StmtKind, 16);
40724072
static_assert_size!(Ty, 64);

compiler/rustc_const_eval/src/interpret/operand.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -878,9 +878,9 @@ mod size_asserts {
878878

879879
use super::*;
880880
// tidy-alphabetical-start
881-
static_assert_size!(Immediate, 48);
882881
static_assert_size!(ImmTy<'_>, 64);
883-
static_assert_size!(Operand, 56);
882+
static_assert_size!(Immediate, 48);
884883
static_assert_size!(OpTy<'_>, 72);
884+
static_assert_size!(Operand, 56);
885885
// tidy-alphabetical-end
886886
}

compiler/rustc_const_eval/src/interpret/place.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,9 +1056,9 @@ mod size_asserts {
10561056

10571057
use super::*;
10581058
// tidy-alphabetical-start
1059+
static_assert_size!(MPlaceTy<'_>, 64);
10591060
static_assert_size!(MemPlace, 48);
10601061
static_assert_size!(MemPlaceMeta, 24);
1061-
static_assert_size!(MPlaceTy<'_>, 64);
10621062
static_assert_size!(Place, 48);
10631063
static_assert_size!(PlaceTy<'_>, 64);
10641064
// tidy-alphabetical-end

compiler/rustc_hir/src/hir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4992,9 +4992,9 @@ mod size_asserts {
49924992
static_assert_size!(LetStmt<'_>, 72);
49934993
static_assert_size!(Param<'_>, 32);
49944994
static_assert_size!(Pat<'_>, 72);
4995+
static_assert_size!(PatKind<'_>, 48);
49954996
static_assert_size!(Path<'_>, 40);
49964997
static_assert_size!(PathSegment<'_>, 48);
4997-
static_assert_size!(PatKind<'_>, 48);
49984998
static_assert_size!(QPath<'_>, 24);
49994999
static_assert_size!(Res, 12);
50005000
static_assert_size!(Stmt<'_>, 32);

compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ declare_lint_pass! {
131131
UNUSED_IMPORTS,
132132
UNUSED_LABELS,
133133
UNUSED_LIFETIMES,
134-
UNUSED_MACRO_RULES,
135134
UNUSED_MACROS,
135+
UNUSED_MACRO_RULES,
136136
UNUSED_MUT,
137137
UNUSED_QUALIFICATIONS,
138138
UNUSED_UNSAFE,

compiler/rustc_middle/src/ty/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,8 @@ bidirectional_lang_item_map! {
781781
Future,
782782
FutureOutput,
783783
Iterator,
784-
Metadata,
785784
MetaSized,
785+
Metadata,
786786
Option,
787787
PointeeSized,
788788
PointeeTrait,

compiler/rustc_middle/src/ty/structural_impls.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@ TrivialLiftImpls! {
230230
usize,
231231
u64,
232232
// tidy-alphabetical-start
233+
crate::mir::Promoted,
233234
crate::mir::interpret::AllocId,
234235
crate::mir::interpret::Scalar,
235-
crate::mir::Promoted,
236236
rustc_abi::ExternAbi,
237237
rustc_abi::Size,
238238
rustc_hir::Safety,
@@ -267,9 +267,6 @@ TrivialTypeTraversalImpls! {
267267
crate::mir::SwitchTargets,
268268
crate::traits::IsConstable,
269269
crate::traits::OverflowError,
270-
crate::ty::abstract_const::NotConstEvaluatable,
271-
crate::ty::adjustment::AutoBorrowMutability,
272-
crate::ty::adjustment::PointerCoercion,
273270
crate::ty::AdtKind,
274271
crate::ty::AssocItem,
275272
crate::ty::AssocKind,
@@ -281,15 +278,18 @@ TrivialTypeTraversalImpls! {
281278
crate::ty::Placeholder<ty::BoundVar>,
282279
crate::ty::UserTypeAnnotationIndex,
283280
crate::ty::ValTree<'tcx>,
281+
crate::ty::abstract_const::NotConstEvaluatable,
282+
crate::ty::adjustment::AutoBorrowMutability,
283+
crate::ty::adjustment::PointerCoercion,
284284
rustc_abi::FieldIdx,
285285
rustc_abi::VariantIdx,
286286
rustc_ast::InlineAsmOptions,
287287
rustc_ast::InlineAsmTemplatePiece,
288288
rustc_hir::CoroutineKind,
289-
rustc_hir::def_id::LocalDefId,
290289
rustc_hir::HirId,
291290
rustc_hir::MatchSource,
292291
rustc_hir::RangeEnd,
292+
rustc_hir::def_id::LocalDefId,
293293
rustc_span::Ident,
294294
rustc_span::Span,
295295
rustc_span::Symbol,
@@ -303,9 +303,9 @@ TrivialTypeTraversalImpls! {
303303
// interners).
304304
TrivialTypeTraversalAndLiftImpls! {
305305
// tidy-alphabetical-start
306-
crate::ty::instance::ReifyReason,
307306
crate::ty::ParamConst,
308307
crate::ty::ParamTy,
308+
crate::ty::instance::ReifyReason,
309309
rustc_hir::def_id::DefId,
310310
// tidy-alphabetical-end
311311
}

compiler/rustc_target/src/target_features.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ static AARCH64_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
212212
("flagm2", Unstable(sym::aarch64_unstable_target_feature), &[]),
213213
// We forbid directly toggling just `fp-armv8`; it must be toggled with `neon`.
214214
("fp-armv8", Stability::Forbidden { reason: "Rust ties `fp-armv8` to `neon`" }, &[]),
215-
// FEAT_FP16
216-
// Rust ties FP and Neon: https://github.com/rust-lang/rust/pull/91608
217-
("fp16", Stable, &["neon"]),
218215
// FEAT_FP8
219216
("fp8", Unstable(sym::aarch64_unstable_target_feature), &["faminmax", "lut", "bf16"]),
220217
// FEAT_FP8DOT2
@@ -223,6 +220,9 @@ static AARCH64_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
223220
("fp8dot4", Unstable(sym::aarch64_unstable_target_feature), &["fp8fma"]),
224221
// FEAT_FP8FMA
225222
("fp8fma", Unstable(sym::aarch64_unstable_target_feature), &["fp8"]),
223+
// FEAT_FP16
224+
// Rust ties FP and Neon: https://github.com/rust-lang/rust/pull/91608
225+
("fp16", Stable, &["neon"]),
226226
// FEAT_FRINTTS
227227
("frintts", Stable, &[]),
228228
// FEAT_HBC
@@ -236,10 +236,10 @@ static AARCH64_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
236236
("lor", Stable, &[]),
237237
// FEAT_LSE
238238
("lse", Stable, &[]),
239-
// FEAT_LSE128
240-
("lse128", Unstable(sym::aarch64_unstable_target_feature), &["lse"]),
241239
// FEAT_LSE2
242240
("lse2", Unstable(sym::aarch64_unstable_target_feature), &[]),
241+
// FEAT_LSE128
242+
("lse128", Unstable(sym::aarch64_unstable_target_feature), &["lse"]),
243243
// FEAT_LUT
244244
("lut", Unstable(sym::aarch64_unstable_target_feature), &[]),
245245
// FEAT_MOPS
@@ -283,14 +283,14 @@ static AARCH64_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
283283
("sme", Unstable(sym::aarch64_unstable_target_feature), &["bf16"]),
284284
// FEAT_SME_B16B16
285285
("sme-b16b16", Unstable(sym::aarch64_unstable_target_feature), &["bf16", "sme2", "sve-b16b16"]),
286-
// FEAT_SME_F16F16
287-
("sme-f16f16", Unstable(sym::aarch64_unstable_target_feature), &["sme2"]),
288-
// FEAT_SME_F64F64
289-
("sme-f64f64", Unstable(sym::aarch64_unstable_target_feature), &["sme"]),
290286
// FEAT_SME_F8F16
291287
("sme-f8f16", Unstable(sym::aarch64_unstable_target_feature), &["sme-f8f32"]),
292288
// FEAT_SME_F8F32
293289
("sme-f8f32", Unstable(sym::aarch64_unstable_target_feature), &["sme2", "fp8"]),
290+
// FEAT_SME_F16F16
291+
("sme-f16f16", Unstable(sym::aarch64_unstable_target_feature), &["sme2"]),
292+
// FEAT_SME_F64F64
293+
("sme-f64f64", Unstable(sym::aarch64_unstable_target_feature), &["sme"]),
294294
// FEAT_SME_FA64
295295
("sme-fa64", Unstable(sym::aarch64_unstable_target_feature), &["sme", "sve2"]),
296296
// FEAT_SME_I16I64
@@ -376,15 +376,16 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
376376
("amx-avx512", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
377377
("amx-bf16", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
378378
("amx-complex", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
379-
("amx-fp16", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
380379
("amx-fp8", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
380+
("amx-fp16", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
381381
("amx-int8", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
382382
("amx-movrs", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
383383
("amx-tf32", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
384384
("amx-tile", Unstable(sym::x86_amx_intrinsics), &[]),
385385
("amx-transpose", Unstable(sym::x86_amx_intrinsics), &["amx-tile"]),
386386
("apxf", Unstable(sym::apx_target_feature), &[]),
387387
("avx", Stable, &["sse4.2"]),
388+
("avx2", Stable, &["avx"]),
388389
(
389390
"avx10.1",
390391
Unstable(sym::avx10_target_feature),
@@ -405,7 +406,6 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
405406
],
406407
),
407408
("avx10.2", Unstable(sym::avx10_target_feature), &["avx10.1"]),
408-
("avx2", Stable, &["avx"]),
409409
("avx512bf16", Stable, &["avx512bw"]),
410410
("avx512bitalg", Stable, &["avx512bw"]),
411411
("avx512bw", Stable, &["avx512f"]),
@@ -423,8 +423,8 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
423423
("avxifma", Stable, &["avx2"]),
424424
("avxneconvert", Stable, &["avx2"]),
425425
("avxvnni", Stable, &["avx2"]),
426-
("avxvnniint16", Stable, &["avx2"]),
427426
("avxvnniint8", Stable, &["avx2"]),
427+
("avxvnniint16", Stable, &["avx2"]),
428428
("bmi1", Stable, &[]),
429429
("bmi2", Stable, &[]),
430430
("cmpxchg16b", Stable, &[]),
@@ -498,12 +498,12 @@ static POWERPC_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
498498
("altivec", Unstable(sym::powerpc_target_feature), &[]),
499499
("msync", Unstable(sym::powerpc_target_feature), &[]),
500500
("partword-atomics", Unstable(sym::powerpc_target_feature), &[]),
501-
("power10-vector", Unstable(sym::powerpc_target_feature), &["power9-vector"]),
502501
("power8-altivec", Unstable(sym::powerpc_target_feature), &["altivec"]),
503502
("power8-crypto", Unstable(sym::powerpc_target_feature), &["power8-altivec"]),
504503
("power8-vector", Unstable(sym::powerpc_target_feature), &["vsx", "power8-altivec"]),
505504
("power9-altivec", Unstable(sym::powerpc_target_feature), &["power8-altivec"]),
506505
("power9-vector", Unstable(sym::powerpc_target_feature), &["power8-vector", "power9-altivec"]),
506+
("power10-vector", Unstable(sym::powerpc_target_feature), &["power9-vector"]),
507507
("quadword-atomics", Unstable(sym::powerpc_target_feature), &[]),
508508
("vsx", Unstable(sym::powerpc_target_feature), &["altivec"]),
509509
// tidy-alphabetical-end
@@ -535,8 +535,8 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
535535
("unaligned-scalar-mem", Unstable(sym::riscv_target_feature), &[]),
536536
("unaligned-vector-mem", Unstable(sym::riscv_target_feature), &[]),
537537
("v", Unstable(sym::riscv_target_feature), &["zvl128b", "zve64d"]),
538-
("za128rs", Unstable(sym::riscv_target_feature), &[]),
539538
("za64rs", Unstable(sym::riscv_target_feature), &["za128rs"]), // Za64rs ⊃ Za128rs
539+
("za128rs", Unstable(sym::riscv_target_feature), &[]),
540540
("zaamo", Unstable(sym::riscv_target_feature), &[]),
541541
("zabha", Unstable(sym::riscv_target_feature), &["zaamo"]),
542542
("zacas", Unstable(sym::riscv_target_feature), &["zaamo"]),
@@ -613,18 +613,18 @@ static RISCV_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
613613
("zvksg", Unstable(sym::riscv_target_feature), &["zvks", "zvkg"]),
614614
("zvksh", Unstable(sym::riscv_target_feature), &["zve32x"]),
615615
("zvkt", Unstable(sym::riscv_target_feature), &[]),
616-
("zvl1024b", Unstable(sym::riscv_target_feature), &["zvl512b"]),
616+
("zvl32b", Unstable(sym::riscv_target_feature), &[]),
617+
("zvl64b", Unstable(sym::riscv_target_feature), &["zvl32b"]),
617618
("zvl128b", Unstable(sym::riscv_target_feature), &["zvl64b"]),
618-
("zvl16384b", Unstable(sym::riscv_target_feature), &["zvl8192b"]),
619-
("zvl2048b", Unstable(sym::riscv_target_feature), &["zvl1024b"]),
620619
("zvl256b", Unstable(sym::riscv_target_feature), &["zvl128b"]),
621-
("zvl32768b", Unstable(sym::riscv_target_feature), &["zvl16384b"]),
622-
("zvl32b", Unstable(sym::riscv_target_feature), &[]),
623-
("zvl4096b", Unstable(sym::riscv_target_feature), &["zvl2048b"]),
624620
("zvl512b", Unstable(sym::riscv_target_feature), &["zvl256b"]),
625-
("zvl64b", Unstable(sym::riscv_target_feature), &["zvl32b"]),
626-
("zvl65536b", Unstable(sym::riscv_target_feature), &["zvl32768b"]),
621+
("zvl1024b", Unstable(sym::riscv_target_feature), &["zvl512b"]),
622+
("zvl2048b", Unstable(sym::riscv_target_feature), &["zvl1024b"]),
623+
("zvl4096b", Unstable(sym::riscv_target_feature), &["zvl2048b"]),
627624
("zvl8192b", Unstable(sym::riscv_target_feature), &["zvl4096b"]),
625+
("zvl16384b", Unstable(sym::riscv_target_feature), &["zvl8192b"]),
626+
("zvl32768b", Unstable(sym::riscv_target_feature), &["zvl16384b"]),
627+
("zvl65536b", Unstable(sym::riscv_target_feature), &["zvl32768b"]),
628628
// tidy-alphabetical-end
629629
];
630630

@@ -651,13 +651,13 @@ const BPF_FEATURES: &[(&str, Stability, ImpliedFeatures)] =
651651

652652
static CSKY_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
653653
// tidy-alphabetical-start
654-
("10e60", Unstable(sym::csky_target_feature), &["7e10"]),
655654
("2e3", Unstable(sym::csky_target_feature), &["e2"]),
656655
("3e3r1", Unstable(sym::csky_target_feature), &[]),
657656
("3e3r2", Unstable(sym::csky_target_feature), &["3e3r1", "doloop"]),
658657
("3e3r3", Unstable(sym::csky_target_feature), &["doloop"]),
659658
("3e7", Unstable(sym::csky_target_feature), &["2e3"]),
660659
("7e10", Unstable(sym::csky_target_feature), &["3e7"]),
660+
("10e60", Unstable(sym::csky_target_feature), &["7e10"]),
661661
("cache", Unstable(sym::csky_target_feature), &[]),
662662
("doloop", Unstable(sym::csky_target_feature), &[]),
663663
("dsp1e2", Unstable(sym::csky_target_feature), &[]),
@@ -726,12 +726,12 @@ const IBMZ_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
726726
("guarded-storage", Unstable(sym::s390x_target_feature), &[]),
727727
("high-word", Unstable(sym::s390x_target_feature), &[]),
728728
// LLVM does not define message-security-assist-extension versions 1, 2, 6, 10 and 11.
729-
("message-security-assist-extension12", Unstable(sym::s390x_target_feature), &[]),
730729
("message-security-assist-extension3", Unstable(sym::s390x_target_feature), &[]),
731730
("message-security-assist-extension4", Unstable(sym::s390x_target_feature), &[]),
732731
("message-security-assist-extension5", Unstable(sym::s390x_target_feature), &[]),
733732
("message-security-assist-extension8", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3"]),
734733
("message-security-assist-extension9", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3", "message-security-assist-extension4"]),
734+
("message-security-assist-extension12", Unstable(sym::s390x_target_feature), &[]),
735735
("miscellaneous-extensions-2", Unstable(sym::s390x_target_feature), &[]),
736736
("miscellaneous-extensions-3", Unstable(sym::s390x_target_feature), &[]),
737737
("miscellaneous-extensions-4", Unstable(sym::s390x_target_feature), &[]),

compiler/rustc_type_ir/src/lang_items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ pub enum TraitSolverLangItem {
2929
Future,
3030
FutureOutput,
3131
Iterator,
32-
Metadata,
3332
MetaSized,
33+
Metadata,
3434
Option,
3535
PointeeSized,
3636
PointeeTrait,

compiler/rustc_type_ir/src/macros.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ TrivialTypeTraversalImpls! {
5353
crate::BoundConstness,
5454
crate::DebruijnIndex,
5555
crate::PredicatePolarity,
56+
crate::UniverseIndex,
57+
crate::Variance,
5658
crate::solve::BuiltinImplSource,
5759
crate::solve::Certainty,
5860
crate::solve::GoalSource,
59-
crate::UniverseIndex,
60-
crate::Variance,
6161
rustc_ast_ir::Mutability,
6262
// tidy-alphabetical-end
6363
}

library/core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@
150150
#![feature(doc_cfg_hide)]
151151
#![feature(doc_notable_trait)]
152152
#![feature(extern_types)]
153-
#![feature(f128)]
154153
#![feature(f16)]
154+
#![feature(f128)]
155155
#![feature(freeze_impls)]
156156
#![feature(fundamental)]
157157
#![feature(if_let_guard)]

library/coretests/tests/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#![feature(exact_size_is_empty)]
3535
#![feature(extend_one)]
3636
#![feature(extern_types)]
37-
#![feature(f128)]
3837
#![feature(f16)]
38+
#![feature(f128)]
3939
#![feature(float_algebraic)]
4040
#![feature(float_gamma)]
4141
#![feature(float_minimum_maximum)]

library/std/src/io/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@ impl ErrorKind {
462462
Deadlock => "deadlock",
463463
DirectoryNotEmpty => "directory not empty",
464464
ExecutableFileBusy => "executable file busy",
465-
FilesystemLoop => "filesystem loop or indirection limit (e.g. symlink loop)",
466465
FileTooLarge => "file too large",
466+
FilesystemLoop => "filesystem loop or indirection limit (e.g. symlink loop)",
467467
HostUnreachable => "host unreachable",
468468
InProgress => "in progress",
469469
Interrupted => "operation interrupted",

library/std/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@
290290
#![feature(doc_notable_trait)]
291291
#![feature(dropck_eyepatch)]
292292
#![feature(extended_varargs_abi_support)]
293-
#![feature(f128)]
294293
#![feature(f16)]
294+
#![feature(f128)]
295295
#![feature(ffi_const)]
296296
#![feature(formatting_options)]
297297
#![feature(if_let_guard)]

library/std/src/sys/pal/windows/api.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,20 +271,20 @@ impl WinError {
271271
// tidy-alphabetical-start
272272
pub const ACCESS_DENIED: Self = Self::new(c::ERROR_ACCESS_DENIED);
273273
pub const ALREADY_EXISTS: Self = Self::new(c::ERROR_ALREADY_EXISTS);
274-
pub const BAD_NET_NAME: Self = Self::new(c::ERROR_BAD_NET_NAME);
275274
pub const BAD_NETPATH: Self = Self::new(c::ERROR_BAD_NETPATH);
275+
pub const BAD_NET_NAME: Self = Self::new(c::ERROR_BAD_NET_NAME);
276276
pub const CANT_ACCESS_FILE: Self = Self::new(c::ERROR_CANT_ACCESS_FILE);
277277
pub const DELETE_PENDING: Self = Self::new(c::ERROR_DELETE_PENDING);
278-
pub const DIR_NOT_EMPTY: Self = Self::new(c::ERROR_DIR_NOT_EMPTY);
279278
pub const DIRECTORY: Self = Self::new(c::ERROR_DIRECTORY);
279+
pub const DIR_NOT_EMPTY: Self = Self::new(c::ERROR_DIR_NOT_EMPTY);
280280
pub const FILE_NOT_FOUND: Self = Self::new(c::ERROR_FILE_NOT_FOUND);
281281
pub const INSUFFICIENT_BUFFER: Self = Self::new(c::ERROR_INSUFFICIENT_BUFFER);
282282
pub const INVALID_FUNCTION: Self = Self::new(c::ERROR_INVALID_FUNCTION);
283283
pub const INVALID_HANDLE: Self = Self::new(c::ERROR_INVALID_HANDLE);
284284
pub const INVALID_PARAMETER: Self = Self::new(c::ERROR_INVALID_PARAMETER);
285-
pub const NO_MORE_FILES: Self = Self::new(c::ERROR_NO_MORE_FILES);
286285
pub const NOT_FOUND: Self = Self::new(c::ERROR_NOT_FOUND);
287286
pub const NOT_SUPPORTED: Self = Self::new(c::ERROR_NOT_SUPPORTED);
287+
pub const NO_MORE_FILES: Self = Self::new(c::ERROR_NO_MORE_FILES);
288288
pub const OPERATION_ABORTED: Self = Self::new(c::ERROR_OPERATION_ABORTED);
289289
pub const PATH_NOT_FOUND: Self = Self::new(c::ERROR_PATH_NOT_FOUND);
290290
pub const SHARING_VIOLATION: Self = Self::new(c::ERROR_SHARING_VIOLATION);

0 commit comments

Comments
 (0)