Fix the ordering of the static symbols.

1 files changed, 66 insertions, 64 deletions

diff --git a/src/librustc_span/symbol.rs b/src/librustc_span/symbol.rs
index 85039f42a10..aa6f7184168 100644
--- a/src/librustc_span/symbol.rs
+++ b/src/librustc_span/symbol.rs
@@ -112,10 +112,13 @@ symbols! {
     //
     // As well as the symbols listed, there are symbols for the the strings
     // "0", "1", ..., "9", which are accessible via `sym::integer`.
+    //
+    // Keep this list in sorted order, as defined by the Unix `sort` utility.
     Symbols {
         aarch64_target_feature,
         abi,
         abi_amdgpu_kernel,
+        abi_avr_interrupt,
         abi_efiapi,
         abi_msp430_interrupt,
         abi_ptx,
@@ -124,7 +127,6 @@ symbols! {
         abi_unadjusted,
         abi_vectorcall,
         abi_x86_interrupt,
-        abi_avr_interrupt,
         abort,
         aborts,
         address,
@@ -181,6 +183,7 @@ symbols! {
         bin,
         bind_by_move_pattern_guards,
         bindings_after_at,
+        bitreverse,
         block,
         bool,
         borrowck_graphviz_format,
@@ -191,7 +194,6 @@ symbols! {
         braced_empty_structs,
         breakpoint,
         bswap,
-        bitreverse,
         C,
         caller_location,
         cdylib,
@@ -234,8 +236,8 @@ symbols! {
         const_fn_union,
         const_generics,
         const_if_match,
-        const_indexing,
         const_in_array_repeat_expressions,
+        const_indexing,
         const_let,
         const_loop,
         const_mut_refs,
@@ -243,15 +245,15 @@ symbols! {
         const_precise_live_drops,
         const_raw_ptr_deref,
         const_raw_ptr_to_usize_cast,
-        const_transmute,
         const_trait_bound_opt_out,
         const_trait_impl,
+        const_transmute,
         contents,
         context,
         convert,
+        copy,
         Copy,
         copy_closures,
-        copy,
         copy_nonoverlapping,
         copysignf32,
         copysignf64,
@@ -269,21 +271,21 @@ symbols! {
         crate_name,
         crate_type,
         crate_visibility_modifier,
+        ctlz,
+        ctlz_nonzero,
         ctpop,
         cttz,
         cttz_nonzero,
-        ctlz,
-        ctlz_nonzero,
         custom_attribute,
         custom_derive,
         custom_inner_attributes,
         custom_test_frameworks,
         c_variadic,
+        debug,
+        Debug,
         debug_trait,
         declare_lint_pass,
         decl_macro,
-        debug,
-        Debug,
         Decodable,
         Default,
         default_lib_allocator,
@@ -307,40 +309,40 @@ symbols! {
         document_private_items,
         dotdoteq_in_patterns,
         dotdot_in_tuple_patterns,
+        double_braced_closure: "{{closure}}",
+        double_braced_constant: "{{constant}}",
+        double_braced_constructor: "{{constructor}}",
         double_braced_crate: "{{crate}}",
         double_braced_impl: "{{impl}}",
         double_braced_misc: "{{misc}}",
-        double_braced_closure: "{{closure}}",
-        double_braced_constructor: "{{constructor}}",
-        double_braced_constant: "{{constant}}",
         double_braced_opaque: "{{opaque}}",
         dropck_eyepatch,
         dropck_parametricity,
-        drop_types_in_const,
         drop_in_place,
+        drop_types_in_const,
         dylib,
         dyn_trait,
         eh_personality,
         enable,
+        enclosing_scope,
         Encodable,
         env,
         eq,
-        err,
-        Err,
         Eq,
         Equal,
-        enclosing_scope,
+        err,
+        Err,
         exact_div,
         except,
         exclusive_range_pattern,
         exhaustive_integer_patterns,
         exhaustive_patterns,
         existential_type,
-        expf32,
-        expf64,
         exp2f32,
         exp2f64,
         expected,
+        expf32,
+        expf64,
         export_name,
         expr,
         extern_absolute_paths,
@@ -353,9 +355,9 @@ symbols! {
         f16c_target_feature,
         f32,
         f64,
-        fadd_fast,
         fabsf32,
         fabsf64,
+        fadd_fast,
         fdiv_fast,
         feature,
         ffi_const,
@@ -365,8 +367,8 @@ symbols! {
         field_init_shorthand,
         file,
         float_to_int_unchecked,
-        floorf64,
         floorf32,
+        floorf64,
         fmaf32,
         fmaf64,
         fmt,
@@ -376,8 +378,8 @@ symbols! {
         forbid,
         forget,
         format_args,
-        format_args_nl,
         format_args_capture,
+        format_args_nl,
         frem_fast,
         from,
         From,
@@ -386,19 +388,19 @@ symbols! {
         from_generator,
         from_method,
         from_ok,
-        from_usize,
         from_trait,
+        from_usize,
         fsub_fast,
         fundamental,
         future,
         Future,
-        FxHashSet,
         FxHashMap,
-        gen_future,
-        gen_kill,
+        FxHashSet,
         generators,
         generic_associated_types,
         generic_param_attrs,
+        gen_future,
+        gen_kill,
         get_context,
         global_allocator,
         global_asm,
@@ -406,8 +408,8 @@ symbols! {
         half_open_range_patterns,
         hash,
         Hash,
-        HashSet,
         HashMap,
+        HashSet,
         hexagon_target_feature,
         hidden,
         homogeneous_aggregate,
@@ -426,22 +428,22 @@ symbols! {
         if_let,
         if_while_or_patterns,
         ignore,
-        inlateout,
-        inout,
         impl_header_lifetime_elision,
         impl_lint_pass,
         impl_trait_in_bindings,
         import_shadowing,
-        index,
-        index_mut,
         in_band_lifetimes,
         include,
         include_bytes,
         include_str,
         inclusive_range_syntax,
+        index,
+        index_mut,
         infer_outlives_requirements,
         infer_static_outlives_requirements,
+        inlateout,
         inline,
+        inout,
         Input,
         intel,
         into_iter,
@@ -464,8 +466,8 @@ symbols! {
         label_break_value,
         lang,
         lang_items,
-        lazy_normalization_consts,
         lateout,
+        lazy_normalization_consts,
         let_chains,
         lhs,
         lib,
@@ -485,13 +487,13 @@ symbols! {
         literal,
         llvm_asm,
         local_inner_macros,
-        log_syntax,
-        logf32,
-        logf64,
         log10f32,
         log10f64,
         log2f32,
         log2f64,
+        logf32,
+        logf64,
+        log_syntax,
         loop_break_value,
         macro_at_most_once_rep,
         macro_escape,
@@ -509,33 +511,33 @@ symbols! {
         masked,
         match_beginning_vert,
         match_default_bindings,
-        may_dangle,
+        maxnumf32,
+        maxnumf64,
         maybe_uninit_uninit,
         maybe_uninit_zeroed,
-        mem_uninitialized,
-        mem_zeroed,
+        may_dangle,
         member_constraints,
         memory,
+        mem_uninitialized,
+        mem_zeroed,
         message,
         meta,
         min_align_of,
         min_align_of_val,
         min_const_fn,
         min_const_unsafe_fn,
-        min_specialization,
         minnumf32,
         minnumf64,
-        maxnumf32,
-        maxnumf64,
+        min_specialization,
         mips_target_feature,
         miri_start_panic,
         mmx_target_feature,
         module,
         module_path,
         more_struct_aliases,
+        movbe_target_feature,
         move_ref_pattern,
         move_val_init,
-        movbe_target_feature,
         mul_with_overflow,
         must_use,
         naked,
@@ -552,8 +554,8 @@ symbols! {
         never_type,
         never_type_fallback,
         new,
-        next,
         __next,
+        next,
         nll,
         no_builtins,
         no_core,
@@ -569,11 +571,11 @@ symbols! {
         non_ascii_idents,
         None,
         non_exhaustive,
+        no_niche,
         non_modrs_mods,
         nontemporal_store,
         nontrapping_dash_fptoint: "nontrapping-fptoint",
         noreturn,
-        no_niche,
         no_sanitize,
         nostack,
         no_stack_check,
@@ -598,9 +600,9 @@ symbols! {
         options,
         opt_out_copy,
         or,
-        or_patterns,
         Ord,
         Ordering,
+        or_patterns,
         out,
         Output,
         overlapping_marker_traits,
@@ -610,9 +612,9 @@ symbols! {
         panic_impl,
         panic_implementation,
         panic_runtime,
+        param_attrs,
         parent_trait,
         partial_cmp,
-        param_attrs,
         PartialEq,
         PartialOrd,
         passes,
@@ -645,19 +647,19 @@ symbols! {
         preserves_flags,
         primitive,
         proc_dash_macro: "proc-macro",
+        ProceduralMasqueradeDummyType,
         proc_macro,
         proc_macro_attribute,
         proc_macro_def_site,
         proc_macro_derive,
         proc_macro_expr,
         proc_macro_gen,
+        ProcMacroHack,
         proc_macro_hygiene,
         proc_macro_internals,
         proc_macro_mod,
         proc_macro_non_items,
         proc_macro_path_invoc,
-        ProceduralMasqueradeDummyType,
-        ProcMacroHack,
         profiler_builtins,
         profiler_runtime,
         ptr_guaranteed_eq,
@@ -716,8 +718,6 @@ symbols! {
         rust_2018_preview,
         rust_begin_unwind,
         rustc,
-        RustcDecodable,
-        RustcEncodable,
         rustc_allocator,
         rustc_allocator_nounwind,
         rustc_allow_const_fn_ptr,
@@ -725,9 +725,10 @@ symbols! {
         rustc_attrs,
         rustc_builtin_macro,
         rustc_clean,
-        rustc_const_unstable,
         rustc_const_stable,
+        rustc_const_unstable,
         rustc_conversion_suggestion,
+        RustcDecodable,
         rustc_def_path,
         rustc_deprecated,
         rustc_diagnostic_item,
@@ -737,6 +738,7 @@ symbols! {
         rustc_dump_env_program_clauses,
         rustc_dump_program_clauses,
         rustc_dump_user_substs,
+        RustcEncodable,
         rustc_error,
         rustc_expected_cgu_reuse,
         rustc_if_this_changed,
@@ -755,26 +757,26 @@ symbols! {
         rustc_partition_reused,
         rustc_peek,
         rustc_peek_definite_init,
+        rustc_peek_indirectly_mutable,
         rustc_peek_liveness,
         rustc_peek_maybe_init,
         rustc_peek_maybe_uninit,
-        rustc_peek_indirectly_mutable,
         rustc_private,
         rustc_proc_macro_decls,
         rustc_promotable,
         rustc_regions,
-        rustc_unsafe_specialization_marker,
+        rustc_reservation_impl,
         rustc_specialization_trait,
         rustc_stable,
         rustc_std_internal_symbol,
         rustc_symbol_name,
         rustc_synthetic,
-        rustc_reservation_impl,
         rustc_test_marker,
         rustc_then_this_would_need,
+        rustc_unsafe_specialization_marker,
         rustc_variance,
-        rustfmt,
         rust_eh_personality,
+        rustfmt,
         rust_oom,
         rvalue_static_promotion,
         sanitize,
@@ -814,11 +816,11 @@ symbols! {
         static_recursion,
         std,
         std_inject,
-        str,
-        stringify,
         stmt,
         stmt_expr_attributes,
         stop_after_dataflow,
+        str,
+        stringify,
         struct_field_attributes,
         struct_inherit,
         structural_match,
@@ -865,17 +867,17 @@ symbols! {
         tt,
         tuple_indexing,
         two_phase,
-        Ty,
         ty,
-        type_alias_impl_trait,
-        type_id,
-        type_name,
+        Ty,
         TyCtxt,
         TyKind,
         type_alias_enum_variants,
+        type_alias_impl_trait,
         type_ascription,
+        type_id,
         type_length_limit,
         type_macros,
+        type_name,
         u128,
         u16,
         u32,
@@ -915,12 +917,12 @@ symbols! {
         use_nested_groups,
         usize,
         v1,
-        val,
-        var,
-        variant_count,
         va_arg,
         va_copy,
         va_end,
+        val,
+        var,
+        variant_count,
         va_start,
         vec,
         Vec,
@@ -940,8 +942,8 @@ symbols! {
         windows,
         windows_subsystem,
         wrapping_add,
-        wrapping_sub,
         wrapping_mul,
+        wrapping_sub,
         write_bytes,
         Yield,
     }