diff --git a/src/doc/unstable-book/src/SUMMARY.md b/src/doc/unstable-book/src/SUMMARY.md deleted file mode 100644 index d7c36829211..00000000000 --- a/src/doc/unstable-book/src/SUMMARY.md +++ /dev/null @@ -1,225 +0,0 @@ -[The Unstable Book](the-unstable-book.md) - -- [Compiler flags](compiler-flags.md) - - [linker_flavor](compiler-flags/linker-flavor.md) - - [profile](compiler-flags/profile.md) - - [remap_path_prefix](compiler-flags/remap-path-prefix.md) -- [Language features](language-features.md) - - [abi_msp430_interrupt](language-features/abi-msp430-interrupt.md) - - [abi_ptx](language-features/abi-ptx.md) - - [abi_sysv64](language-features/abi-sysv64.md) - - [abi_thiscall](language-features/abi-thiscall.md) - - [abi_unadjusted](language-features/abi-unadjusted.md) - - [abi_vectorcall](language-features/abi-vectorcall.md) - - [abi_x86_interrupt](language-features/abi-x86-interrupt.md) - - [advanced_slice_patterns](language-features/advanced-slice-patterns.md) - - [allocator](language-features/allocator.md) - - [allow_internal_unstable](language-features/allow-internal-unstable.md) - - [asm](language-features/asm.md) - - [associated_consts](language-features/associated-consts.md) - - [associated_type_defaults](language-features/associated-type-defaults.md) - - [attr_literals](language-features/attr-literals.md) - - [box_patterns](language-features/box-patterns.md) - - [box_syntax](language-features/box-syntax.md) - - [catch_expr](language-features/catch-expr.md) - - [cfg_target_feature](language-features/cfg-target-feature.md) - - [cfg_target_has_atomic](language-features/cfg-target-has-atomic.md) - - [cfg_target_thread_local](language-features/cfg-target-thread-local.md) - - [cfg_target_vendor](language-features/cfg-target-vendor.md) - - [compiler_builtins](language-features/compiler-builtins.md) - - [concat_idents](language-features/concat-idents.md) - - [conservative_impl_trait](language-features/conservative-impl-trait.md) - - [const_fn](language-features/const-fn.md) - - [const_indexing](language-features/const-indexing.md) - - [custom_attribute](language-features/custom-attribute.md) - - [custom_derive](language-features/custom-derive.md) - - [default_type_parameter_fallback](language-features/default-type-parameter-fallback.md) - - [drop_types_in_const](language-features/drop-types-in-const.md) - - [dropck_eyepatch](language-features/dropck-eyepatch.md) - - [dropck_parametricity](language-features/dropck-parametricity.md) - - [exclusive_range_pattern](language-features/exclusive-range-pattern.md) - - [fundamental](language-features/fundamental.md) - - [generic_param_attrs](language-features/generic-param-attrs.md) - - [global_asm](language-features/global_asm.md) - - [i128_type](language-features/i128-type.md) - - [inclusive_range_syntax](language-features/inclusive-range-syntax.md) - - [intrinsics](language-features/intrinsics.md) - - [lang_items](language-features/lang-items.md) - - [link_args](language-features/link-args.md) - - [link_cfg](language-features/link-cfg.md) - - [link_llvm_intrinsics](language-features/link-llvm-intrinsics.md) - - [linkage](language-features/linkage.md) - - [log_syntax](language-features/log-syntax.md) - - [macro_reexport](language-features/macro-reexport.md) - - [macro_vis_matcher](language-features/macro-vis-matcher.md) - - [main](language-features/main.md) - - [naked_functions](language-features/naked-functions.md) - - [needs_allocator](language-features/needs-allocator.md) - - [needs_panic_runtime](language-features/needs-panic-runtime.md) - - [never_type](language-features/never-type.md) - - [no_core](language-features/no-core.md) - - [no_debug](language-features/no-debug.md) - - [non_ascii_idents](language-features/non-ascii-idents.md) - - [omit_gdb_pretty_printer_section](language-features/omit-gdb-pretty-printer-section.md) - - [on_unimplemented](language-features/on-unimplemented.md) - - [optin_builtin_traits](language-features/optin-builtin-traits.md) - - [overlapping_marker_traits](language-features/overlapping-marker-traits.md) - - [panic_runtime](language-features/panic-runtime.md) - - [placement_in_syntax](language-features/placement-in-syntax.md) - - [platform_intrinsics](language-features/platform-intrinsics.md) - - [plugin](language-features/plugin.md) - - [plugin_registrar](language-features/plugin-registrar.md) - - [prelude_import](language-features/prelude-import.md) - - [proc_macro](language-features/proc-macro.md) - - [profiler_runtime](language-features/profiler-runtime.md) - - [quote](language-features/quote.md) - - [repr_align](language-features/repr-align.md) - - [repr_simd](language-features/repr-simd.md) - - [rustc_attrs](language-features/rustc-attrs.md) - - [rustc_diagnostic_macros](language-features/rustc-diagnostic-macros.md) - - [rvalue_static_promotion](language-features/rvalue-static-promotion.md) - - [sanitizer_runtime](language-features/sanitizer-runtime.md) - - [simd](language-features/simd.md) - - [simd_ffi](language-features/simd-ffi.md) - - [slice_patterns](language-features/slice-patterns.md) - - [specialization](language-features/specialization.md) - - [staged_api](language-features/staged-api.md) - - [start](language-features/start.md) - - [static_nobundle](language-features/static-nobundle.md) - - [stmt_expr_attributes](language-features/stmt-expr-attributes.md) - - [structural_match](language-features/structural-match.md) - - [target_feature](language-features/target-feature.md) - - [thread_local](language-features/thread-local.md) - - [trace_macros](language-features/trace-macros.md) - - [type_ascription](language-features/type-ascription.md) - - [unboxed_closures](language-features/unboxed-closures.md) - - [untagged_unions](language-features/untagged-unions.md) - - [unwind_attributes](language-features/unwind-attributes.md) - - [use_extern_macros](language-features/use-extern-macros.md) - - [used](language-features/used.md) -- [Library Features](library-features.md) - - [alloc_jemalloc](library-features/alloc-jemalloc.md) - - [alloc_system](library-features/alloc-system.md) - - [alloc](library-features/alloc.md) - - [as_c_str](library-features/as-c-str.md) - - [ascii_ctype](library-features/ascii-ctype.md) - - [box_heap](library-features/box-heap.md) - - [c_void_variant](library-features/c-void-variant.md) - - [char_escape_debug](library-features/char-escape-debug.md) - - [coerce_unsized](library-features/coerce-unsized.md) - - [collection_placement](library-features/collection-placement.md) - - [collections](library-features/collections.md) - - [collections_range](library-features/collections-range.md) - - [command_envs](library-features/command-envs.md) - - [compiler_builtins_lib](library-features/compiler-builtins-lib.md) - - [compiler_fences](library-features/compiler-fences.md) - - [concat_idents_macro](library-features/concat-idents-macro.md) - - [core_char_ext](library-features/core-char-ext.md) - - [core_float](library-features/core-float.md) - - [core_intrinsics](library-features/core-intrinsics.md) - - [core_panic](library-features/core-panic.md) - - [core_private_bignum](library-features/core-private-bignum.md) - - [core_private_diy_float](library-features/core-private-diy-float.md) - - [core_slice_ext](library-features/core-slice-ext.md) - - [core_str_ext](library-features/core-str-ext.md) - - [dec2flt](library-features/dec2flt.md) - - [decode_utf8](library-features/decode-utf8.md) - - [derive_clone_copy](library-features/derive-clone-copy.md) - - [derive_eq](library-features/derive-eq.md) - - [discriminant_value](library-features/discriminant-value.md) - - [error_type_id](library-features/error-type-id.md) - - [exact_size_is_empty](library-features/exact-size-is-empty.md) - - [fd](library-features/fd.md) - - [fd_read](library-features/fd-read.md) - - [fixed_size_array](library-features/fixed-size-array.md) - - [float_bits_conv](library-features/float-bits-conv.md) - - [flt2dec](library-features/flt2dec.md) - - [fmt_flags_align](library-features/fmt-flags-align.md) - - [fmt_internals](library-features/fmt-internals.md) - - [fn_traits](library-features/fn-traits.md) - - [fnbox](library-features/fnbox.md) - - [from_utf8_error_as_bytes](library-features/from_utf8_error_as_bytes.md) - - [fused](library-features/fused.md) - - [future_atomic_orderings](library-features/future-atomic-orderings.md) - - [get_type_id](library-features/get-type-id.md) - - [heap_api](library-features/heap-api.md) - - [hint_core_should_pause](library-features/hint-core-should-pause.md) - - [i128](library-features/i128.md) - - [inclusive_range](library-features/inclusive-range.md) - - [integer_atomics](library-features/integer-atomics.md) - - [into_boxed_c_str](library-features/into-boxed-c-str.md) - - [into_boxed_os_str](library-features/into-boxed-os-str.md) - - [into_boxed_path](library-features/into-boxed-path.md) - - [io_error_internals](library-features/io-error-internals.md) - - [io](library-features/io.md) - - [ip](library-features/ip.md) - - [iter_rfind](library-features/iter-rfind.md) - - [iterator_step_by](library-features/iterator-step-by.md) - - [libstd_io_internals](library-features/libstd-io-internals.md) - - [libstd_sys_internals](library-features/libstd-sys-internals.md) - - [libstd_thread_internals](library-features/libstd-thread-internals.md) - - [linked_list_extras](library-features/linked-list-extras.md) - - [lookup_host](library-features/lookup-host.md) - - [manually_drop](library-features/manually-drop.md) - - [more_io_inner_methods](library-features/more-io-inner-methods.md) - - [mpsc_select](library-features/mpsc-select.md) - - [n16](library-features/n16.md) - - [never_type_impls](library-features/never-type-impls.md) - - [nonzero](library-features/nonzero.md) - - [ord_max_min](library-features/ord-max-min.md) - - [offset_to](library-features/offset-to.md) - - [once_poison](library-features/once-poison.md) - - [oom](library-features/oom.md) - - [option_entry](library-features/option-entry.md) - - [osstring_shrink_to_fit](library-features/osstring-shrink-to-fit.md) - - [panic_abort](library-features/panic-abort.md) - - [panic_unwind](library-features/panic-unwind.md) - - [pattern](library-features/pattern.md) - - [placement_in](library-features/placement-in.md) - - [placement_new_protocol](library-features/placement-new-protocol.md) - - [print_internals](library-features/print-internals.md) - - [proc_macro_internals](library-features/proc-macro-internals.md) - - [profiler_runtime_lib](library-features/sanitizer-runtime-lib.md) - - [question_mark_carrier](library-features/question-mark-carrier.md) - - [rand](library-features/rand.md) - - [range_contains](library-features/range-contains.md) - - [raw](library-features/raw.md) - - [reverse_cmp_key](library-features/reverse-cmp-key.md) - - [rt](library-features/rt.md) - - [rustc_private](library-features/rustc-private.md) - - [sanitizer_runtime_lib](library-features/sanitizer-runtime-lib.md) - - [set_stdio](library-features/set-stdio.md) - - [shared](library-features/shared.md) - - [sip_hash_13](library-features/sip-hash-13.md) - - [slice_concat_ext](library-features/slice-concat-ext.md) - - [slice_get_slice](library-features/slice-get-slice.md) - - [slice_rotate](library-features/slice-rotate.md) - - [slice_rsplit](library-features/slice-rsplit.md) - - [sort_internals](library-features/sort-internals.md) - - [sort_unstable](library-features/sort-unstable.md) - - [splice](library-features/splice.md) - - [step_by](library-features/step-by.md) - - [step_trait](library-features/step-trait.md) - - [str_checked_slicing](library-features/str-checked-slicing.md) - - [str_escape](library-features/str-escape.md) - - [str_internals](library-features/str-internals.md) - - [str_box_extras](library-features/str-box-extras.md) - - [str_mut_extras](library-features/str-mut-extras.md) - - [test](library-features/test.md) - - [thread_id](library-features/thread-id.md) - - [thread_local_internals](library-features/thread-local-internals.md) - - [thread_local_state](library-features/thread-local-state.md) - - [toowned_clone_into](library-features/toowned-clone-into.md) - - [trusted_len](library-features/trusted-len.md) - - [try_from](library-features/try-from.md) - - [try_trait](library-features/try-trait.md) - - [unicode](library-features/unicode.md) - - [unique](library-features/unique.md) - - [unsize](library-features/unsize.md) - - [utf8_error_error_len](library-features/utf8-error-error-len.md) - - [vec_resize_default](library-features/vec-resize-default.md) - - [vec_remove_item](library-features/vec-remove-item.md) - - [windows_c](library-features/windows-c.md) - - [windows_handle](library-features/windows-handle.md) - - [windows_net](library-features/windows-net.md) - - [windows_stdio](library-features/windows-stdio.md) diff --git a/src/tools/tidy/src/unstable_book.rs b/src/tools/tidy/src/unstable_book.rs index c8bfe42aa03..ff032b14ad1 100644 --- a/src/tools/tidy/src/unstable_book.rs +++ b/src/tools/tidy/src/unstable_book.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::collections::HashSet; +use std::collections::BTreeSet; use std::fs; use std::path; use features::{collect_lang_features, collect_lib_features, Features, Status}; @@ -45,7 +45,7 @@ fn dir_entry_is_file(dir_entry: &fs::DirEntry) -> bool { } /// Retrieve names of all unstable features -pub fn collect_unstable_feature_names(features: &Features) -> HashSet { +pub fn collect_unstable_feature_names(features: &Features) -> BTreeSet { features .iter() .filter(|&(_, ref f)| f.level == Status::Unstable) @@ -53,7 +53,7 @@ pub fn collect_unstable_feature_names(features: &Features) -> HashSet { .collect() } -pub fn collect_unstable_book_section_file_names(dir: &path::Path) -> HashSet { +pub fn collect_unstable_book_section_file_names(dir: &path::Path) -> BTreeSet { fs::read_dir(dir) .expect("could not read directory") .into_iter() @@ -69,7 +69,7 @@ pub fn collect_unstable_book_section_file_names(dir: &path::Path) -> HashSet HashSet { + -> BTreeSet { collect_unstable_book_section_file_names(&unstable_book_lang_features_path(base_src_path)) } @@ -78,7 +78,7 @@ fn collect_unstable_book_lang_features_section_file_names(base_src_path: &path:: /// * hyphens replaced by underscores /// * the markdown suffix ('.md') removed fn collect_unstable_book_lib_features_section_file_names(base_src_path: &path::Path) - -> HashSet { + -> BTreeSet { collect_unstable_book_section_file_names(&unstable_book_lib_features_path(base_src_path)) } diff --git a/src/tools/unstable-book-gen/src/main.rs b/src/tools/unstable-book-gen/src/main.rs index 71063968ff2..5c2bd1e3e08 100644 --- a/src/tools/unstable-book-gen/src/main.rs +++ b/src/tools/unstable-book-gen/src/main.rs @@ -17,7 +17,7 @@ use tidy::features::{Feature, Features, collect_lib_features, collect_lang_features}; use tidy::unstable_book::{collect_unstable_feature_names, collect_unstable_book_section_file_names, PATH_STR, LANG_FEATURES_DIR, LIB_FEATURES_DIR}; -use std::collections::HashSet; +use std::collections::BTreeSet; use std::io::Write; use std::fs::{self, File}; use std::env; @@ -48,9 +48,9 @@ fn generate_stub_no_issue(path: &Path, name: &str) { name = name))); } -fn hset_to_summary_str(hset: HashSet, dir: &str +fn set_to_summary_str(set: &BTreeSet, dir: &str ) -> String { - hset + set .iter() .map(|ref n| format!(" - [{}]({}/{}.md)", n, @@ -63,16 +63,16 @@ fn generate_summary(path: &Path, lang_features: &Features, lib_features: &Featur let compiler_flags = collect_unstable_book_section_file_names( &path.join("compiler-flags")); - let compiler_flags_str = hset_to_summary_str(compiler_flags, - "compiler-flags"); + let compiler_flags_str = set_to_summary_str(&compiler_flags, + "compiler-flags"); let unstable_lang_features = collect_unstable_feature_names(&lang_features); let unstable_lib_features = collect_unstable_feature_names(&lib_features); - let lang_features_str = hset_to_summary_str(unstable_lang_features, - LANG_FEATURES_DIR); - let lib_features_str = hset_to_summary_str(unstable_lib_features, - LIB_FEATURES_DIR); + let lang_features_str = set_to_summary_str(&unstable_lang_features, + LANG_FEATURES_DIR); + let lib_features_str = set_to_summary_str(&unstable_lib_features, + LIB_FEATURES_DIR); let mut file = t!(File::create(&path.join("SUMMARY.md"))); t!(file.write_fmt(format_args!(include_str!("SUMMARY.md"),