Auto merge of #7773 - Manishearth:update-lints-mods, r=flip1995

Move module declarations back into lib.rs

With #7673 we moved a lot of things from lib.rs to lib.foo.rs. Unfortunately, rustfmt doesn't seem to work when module declarations are included via `include!` (and trying the `mod foo; use foo::*;` trick doesn't seem to work much either in our specific case).

With this PR we continue generating everything in subfiles except for module declarations, which are now generated within lib.rs.

changelog: none

clippy_dev/src/update_lints.rs

@@ -98,6 +98,17 @@ pub fn run(update_mode: UpdateMode) {
     )
     .changed;
 
+    // This has to be in lib.rs, otherwise rustfmt doesn't work
+    file_change |= replace_region_in_file(
+        Path::new("clippy_lints/src/lib.rs"),
+        "begin lints modules",
+        "end lints modules",
+        false,
+        update_mode == UpdateMode::Change,
+        || vec![gen_modules_list(usable_lints.iter())],
+    )
+    .changed;
+
     if file_change && update_mode == UpdateMode::Check {
         exit_with_failure();
     }
@@ -112,11 +123,6 @@ pub fn run(update_mode: UpdateMode) {
         update_mode,
         &gen_deprecated(deprecated_lints.iter()),
     );
-    process_file(
-        "clippy_lints/src/lib.mods.rs",
-        update_mode,
-        &gen_modules_list(usable_lints.iter()),
-    );
 
     let all_group_lints = usable_lints.iter().filter(|l| {
         matches!(

clippy_lints/src/lib.mods.rs

@@ -1,234 +0,0 @@
-// This file was generated by `cargo dev update_lints`.
-// Use that command to update this file and do not edit by hand.
-// Manual edits will be overwritten.
-
-mod absurd_extreme_comparisons;
-mod approx_const;
-mod arithmetic;
-mod as_conversions;
-mod asm_syntax;
-mod assertions_on_constants;
-mod assign_ops;
-mod async_yields_async;
-mod attrs;
-mod await_holding_invalid;
-mod bit_mask;
-mod blacklisted_name;
-mod blocks_in_if_conditions;
-mod bool_assert_comparison;
-mod booleans;
-mod bytecount;
-mod cargo_common_metadata;
-mod case_sensitive_file_extension_comparisons;
-mod casts;
-mod checked_conversions;
-mod cognitive_complexity;
-mod collapsible_if;
-mod collapsible_match;
-mod comparison_chain;
-mod copies;
-mod copy_iterator;
-mod create_dir;
-mod dbg_macro;
-mod default;
-mod default_numeric_fallback;
-mod dereference;
-mod derivable_impls;
-mod derive;
-mod disallowed_method;
-mod disallowed_script_idents;
-mod disallowed_type;
-mod doc;
-mod double_comparison;
-mod double_parens;
-mod drop_forget_ref;
-mod duration_subsec;
-mod else_if_without_else;
-mod empty_enum;
-mod entry;
-mod enum_clike;
-mod enum_variants;
-mod eq_op;
-mod equatable_if_let;
-mod erasing_op;
-mod escape;
-mod eta_reduction;
-mod eval_order_dependence;
-mod excessive_bools;
-mod exhaustive_items;
-mod exit;
-mod explicit_write;
-mod fallible_impl_from;
-mod feature_name;
-mod float_equality_without_abs;
-mod float_literal;
-mod floating_point_arithmetic;
-mod format;
-mod formatting;
-mod from_over_into;
-mod from_str_radix_10;
-mod functions;
-mod future_not_send;
-mod get_last_with_len;
-mod identity_op;
-mod if_let_mutex;
-mod if_not_else;
-mod if_then_panic;
-mod if_then_some_else_none;
-mod implicit_hasher;
-mod implicit_return;
-mod implicit_saturating_sub;
-mod inconsistent_struct_constructor;
-mod indexing_slicing;
-mod infinite_iter;
-mod inherent_impl;
-mod inherent_to_string;
-mod inline_fn_without_body;
-mod int_plus_one;
-mod integer_division;
-mod invalid_upcast_comparisons;
-mod items_after_statements;
-mod iter_not_returning_iterator;
-mod large_const_arrays;
-mod large_enum_variant;
-mod large_stack_arrays;
-mod len_zero;
-mod let_if_seq;
-mod let_underscore;
-mod lifetimes;
-mod literal_representation;
-mod loops;
-mod macro_use;
-mod main_recursion;
-mod manual_async_fn;
-mod manual_map;
-mod manual_non_exhaustive;
-mod manual_ok_or;
-mod manual_strip;
-mod manual_unwrap_or;
-mod map_clone;
-mod map_err_ignore;
-mod map_unit_fn;
-mod match_on_vec_items;
-mod match_result_ok;
-mod matches;
-mod mem_discriminant;
-mod mem_forget;
-mod mem_replace;
-mod methods;
-mod minmax;
-mod misc;
-mod misc_early;
-mod missing_const_for_fn;
-mod missing_doc;
-mod missing_enforced_import_rename;
-mod missing_inline;
-mod module_style;
-mod modulo_arithmetic;
-mod multiple_crate_versions;
-mod mut_key;
-mod mut_mut;
-mod mut_mutex_lock;
-mod mut_reference;
-mod mutable_debug_assertion;
-mod mutex_atomic;
-mod needless_arbitrary_self_type;
-mod needless_bitwise_bool;
-mod needless_bool;
-mod needless_borrow;
-mod needless_borrowed_ref;
-mod needless_continue;
-mod needless_for_each;
-mod needless_option_as_deref;
-mod needless_pass_by_value;
-mod needless_question_mark;
-mod needless_update;
-mod neg_cmp_op_on_partial_ord;
-mod neg_multiply;
-mod new_without_default;
-mod no_effect;
-mod non_copy_const;
-mod non_expressive_names;
-mod non_octal_unix_permissions;
-mod non_send_fields_in_send_ty;
-mod nonstandard_macro_braces;
-mod open_options;
-mod option_env_unwrap;
-mod option_if_let_else;
-mod overflow_check_conditional;
-mod panic_in_result_fn;
-mod panic_unimplemented;
-mod partialeq_ne_impl;
-mod pass_by_ref_or_value;
-mod path_buf_push_overwrite;
-mod pattern_type_mismatch;
-mod precedence;
-mod ptr;
-mod ptr_eq;
-mod ptr_offset_with_cast;
-mod question_mark;
-mod ranges;
-mod redundant_clone;
-mod redundant_closure_call;
-mod redundant_else;
-mod redundant_field_names;
-mod redundant_pub_crate;
-mod redundant_slicing;
-mod redundant_static_lifetimes;
-mod ref_option_ref;
-mod reference;
-mod regex;
-mod repeat_once;
-mod returns;
-mod same_name_method;
-mod self_assignment;
-mod self_named_constructors;
-mod semicolon_if_nothing_returned;
-mod serde_api;
-mod shadow;
-mod single_component_path_imports;
-mod size_of_in_element_count;
-mod slow_vector_initialization;
-mod stable_sort_primitive;
-mod strings;
-mod strlen_on_c_strings;
-mod suspicious_operation_groupings;
-mod suspicious_trait_impl;
-mod swap;
-mod tabs_in_doc_comments;
-mod temporary_assignment;
-mod to_digit_is_some;
-mod to_string_in_display;
-mod trait_bounds;
-mod transmute;
-mod transmuting_null;
-mod try_err;
-mod types;
-mod undropped_manually_drops;
-mod unicode;
-mod unit_return_expecting_ord;
-mod unit_types;
-mod unnamed_address;
-mod unnecessary_self_imports;
-mod unnecessary_sort_by;
-mod unnecessary_wraps;
-mod unnested_or_patterns;
-mod unsafe_removed_from_name;
-mod unused_async;
-mod unused_io_amount;
-mod unused_self;
-mod unused_unit;
-mod unwrap;
-mod unwrap_in_result;
-mod upper_case_acronyms;
-mod use_self;
-mod useless_conversion;
-mod vec;
-mod vec_init_then_push;
-mod vec_resize_to_zero;
-mod verbose_file_reads;
-mod wildcard_dependencies;
-mod wildcard_imports;
-mod write;
-mod zero_div_zero;
-mod zero_sized_map_values;

clippy_lints/src/lib.rs

@@ -155,7 +155,243 @@ macro_rules! declare_clippy_lint {
 mod deprecated_lints;
 mod utils;
 
-include!("lib.mods.rs");
+// begin lints modules, do not remove this comment, it’s used in `update_lints`
+// This file was generated by `cargo dev update_lints`.
+// Use that command to update this file and do not edit by hand.
+// Manual edits will be overwritten.
+
+mod absurd_extreme_comparisons;
+mod approx_const;
+mod arithmetic;
+mod as_conversions;
+mod asm_syntax;
+mod assertions_on_constants;
+mod assign_ops;
+mod async_yields_async;
+mod attrs;
+mod await_holding_invalid;
+mod bit_mask;
+mod blacklisted_name;
+mod blocks_in_if_conditions;
+mod bool_assert_comparison;
+mod booleans;
+mod bytecount;
+mod cargo_common_metadata;
+mod case_sensitive_file_extension_comparisons;
+mod casts;
+mod checked_conversions;
+mod cognitive_complexity;
+mod collapsible_if;
+mod collapsible_match;
+mod comparison_chain;
+mod copies;
+mod copy_iterator;
+mod create_dir;
+mod dbg_macro;
+mod default;
+mod default_numeric_fallback;
+mod dereference;
+mod derivable_impls;
+mod derive;
+mod disallowed_method;
+mod disallowed_script_idents;
+mod disallowed_type;
+mod doc;
+mod double_comparison;
+mod double_parens;
+mod drop_forget_ref;
+mod duration_subsec;
+mod else_if_without_else;
+mod empty_enum;
+mod entry;
+mod enum_clike;
+mod enum_variants;
+mod eq_op;
+mod equatable_if_let;
+mod erasing_op;
+mod escape;
+mod eta_reduction;
+mod eval_order_dependence;
+mod excessive_bools;
+mod exhaustive_items;
+mod exit;
+mod explicit_write;
+mod fallible_impl_from;
+mod feature_name;
+mod float_equality_without_abs;
+mod float_literal;
+mod floating_point_arithmetic;
+mod format;
+mod formatting;
+mod from_over_into;
+mod from_str_radix_10;
+mod functions;
+mod future_not_send;
+mod get_last_with_len;
+mod identity_op;
+mod if_let_mutex;
+mod if_not_else;
+mod if_then_panic;
+mod if_then_some_else_none;
+mod implicit_hasher;
+mod implicit_return;
+mod implicit_saturating_sub;
+mod inconsistent_struct_constructor;
+mod indexing_slicing;
+mod infinite_iter;
+mod inherent_impl;
+mod inherent_to_string;
+mod inline_fn_without_body;
+mod int_plus_one;
+mod integer_division;
+mod invalid_upcast_comparisons;
+mod items_after_statements;
+mod iter_not_returning_iterator;
+mod large_const_arrays;
+mod large_enum_variant;
+mod large_stack_arrays;
+mod len_zero;
+mod let_if_seq;
+mod let_underscore;
+mod lifetimes;
+mod literal_representation;
+mod loops;
+mod macro_use;
+mod main_recursion;
+mod manual_async_fn;
+mod manual_map;
+mod manual_non_exhaustive;
+mod manual_ok_or;
+mod manual_strip;
+mod manual_unwrap_or;
+mod map_clone;
+mod map_err_ignore;
+mod map_unit_fn;
+mod match_on_vec_items;
+mod match_result_ok;
+mod matches;
+mod mem_discriminant;
+mod mem_forget;
+mod mem_replace;
+mod methods;
+mod minmax;
+mod misc;
+mod misc_early;
+mod missing_const_for_fn;
+mod missing_doc;
+mod missing_enforced_import_rename;
+mod missing_inline;
+mod module_style;
+mod modulo_arithmetic;
+mod multiple_crate_versions;
+mod mut_key;
+mod mut_mut;
+mod mut_mutex_lock;
+mod mut_reference;
+mod mutable_debug_assertion;
+mod mutex_atomic;
+mod needless_arbitrary_self_type;
+mod needless_bitwise_bool;
+mod needless_bool;
+mod needless_borrow;
+mod needless_borrowed_ref;
+mod needless_continue;
+mod needless_for_each;
+mod needless_option_as_deref;
+mod needless_pass_by_value;
+mod needless_question_mark;
+mod needless_update;
+mod neg_cmp_op_on_partial_ord;
+mod neg_multiply;
+mod new_without_default;
+mod no_effect;
+mod non_copy_const;
+mod non_expressive_names;
+mod non_octal_unix_permissions;
+mod non_send_fields_in_send_ty;
+mod nonstandard_macro_braces;
+mod open_options;
+mod option_env_unwrap;
+mod option_if_let_else;
+mod overflow_check_conditional;
+mod panic_in_result_fn;
+mod panic_unimplemented;
+mod partialeq_ne_impl;
+mod pass_by_ref_or_value;
+mod path_buf_push_overwrite;
+mod pattern_type_mismatch;
+mod precedence;
+mod ptr;
+mod ptr_eq;
+mod ptr_offset_with_cast;
+mod question_mark;
+mod ranges;
+mod redundant_clone;
+mod redundant_closure_call;
+mod redundant_else;
+mod redundant_field_names;
+mod redundant_pub_crate;
+mod redundant_slicing;
+mod redundant_static_lifetimes;
+mod ref_option_ref;
+mod reference;
+mod regex;
+mod repeat_once;
+mod returns;
+mod same_name_method;
+mod self_assignment;
+mod self_named_constructors;
+mod semicolon_if_nothing_returned;
+mod serde_api;
+mod shadow;
+mod single_component_path_imports;
+mod size_of_in_element_count;
+mod slow_vector_initialization;
+mod stable_sort_primitive;
+mod strings;
+mod strlen_on_c_strings;
+mod suspicious_operation_groupings;
+mod suspicious_trait_impl;
+mod swap;
+mod tabs_in_doc_comments;
+mod temporary_assignment;
+mod to_digit_is_some;
+mod to_string_in_display;
+mod trait_bounds;
+mod transmute;
+mod transmuting_null;
+mod try_err;
+mod types;
+mod undropped_manually_drops;
+mod unicode;
+mod unit_return_expecting_ord;
+mod unit_types;
+mod unnamed_address;
+mod unnecessary_self_imports;
+mod unnecessary_sort_by;
+mod unnecessary_wraps;
+mod unnested_or_patterns;
+mod unsafe_removed_from_name;
+mod unused_async;
+mod unused_io_amount;
+mod unused_self;
+mod unused_unit;
+mod unwrap;
+mod unwrap_in_result;
+mod upper_case_acronyms;
+mod use_self;
+mod useless_conversion;
+mod vec;
+mod vec_init_then_push;
+mod vec_resize_to_zero;
+mod verbose_file_reads;
+mod wildcard_dependencies;
+mod wildcard_imports;
+mod write;
+mod zero_div_zero;
+mod zero_sized_map_values;
+
+// end lints modules, do not remove this comment, it’s used in `update_lints`
 
 pub use crate::utils::conf::Conf;
 use crate::utils::conf::TryConf;