Fixed Typo

revert merge request: Auto merge of rust-lang#9817 - mgrachev:patch-1, r=Manishearth

43a6d0b

This revert merge request !2

Author: wangkirin

CHANGELOG.md

@@ -4,157 +4,13 @@ All notable changes to this project will be documented in this file.
 See [Changelog Update](book/src/development/infrastructure/changelog_update.md) if you want to update this
 document.
 
-## Unreleased / Beta / In Rust Nightly
+## Unreleased / In Rust Nightly
 
-[b52fb523...master](https://github.com/rust-lang/rust-clippy/compare/b52fb523...master)
-
-## Rust 1.65
-
-Current stable, released 2022-11-03
-
-[3c7e7dbc...b52fb523](https://github.com/rust-lang/rust-clippy/compare/3c7e7dbc...b52fb523)
-
-### Important Changes
-
-* Clippy now has an `--explain <LINT>` command to show the lint description in the console
-  [#8952](https://github.com/rust-lang/rust-clippy/pull/8952)
-
-### New Lints
-
-* [`unused_peekable`]
-  [#9258](https://github.com/rust-lang/rust-clippy/pull/9258)
-* [`collapsible_str_replace`]
-  [#9269](https://github.com/rust-lang/rust-clippy/pull/9269)
-* [`manual_string_new`]
-  [#9295](https://github.com/rust-lang/rust-clippy/pull/9295)
-* [`iter_on_empty_collections`]
-  [#9187](https://github.com/rust-lang/rust-clippy/pull/9187)
-* [`iter_on_single_items`]
-  [#9187](https://github.com/rust-lang/rust-clippy/pull/9187)
-* [`bool_to_int_with_if`]
-  [#9412](https://github.com/rust-lang/rust-clippy/pull/9412)
-* [`multi_assignments`]
-  [#9379](https://github.com/rust-lang/rust-clippy/pull/9379)
-* [`result_large_err`]
-  [#9373](https://github.com/rust-lang/rust-clippy/pull/9373)
-* [`partialeq_to_none`]
-  [#9288](https://github.com/rust-lang/rust-clippy/pull/9288)
-* [`suspicious_to_owned`]
-  [#8984](https://github.com/rust-lang/rust-clippy/pull/8984)
-* [`cast_slice_from_raw_parts`]
-  [#9247](https://github.com/rust-lang/rust-clippy/pull/9247)
-* [`manual_instant_elapsed`]
-  [#9264](https://github.com/rust-lang/rust-clippy/pull/9264)
-
-### Moves and Deprecations
-
-* Moved [`significant_drop_in_scrutinee`] to `nursery` (now allow-by-default)
-  [#9302](https://github.com/rust-lang/rust-clippy/pull/9302)
-* Rename `logic_bug` to [`overly_complex_bool_expr`]
-  [#9306](https://github.com/rust-lang/rust-clippy/pull/9306)
-* Rename `arithmetic` to [`arithmetic_side_effects`]
-  [#9443](https://github.com/rust-lang/rust-clippy/pull/9443)
-* Moved [`only_used_in_recursion`] to complexity (now warn-by-default)
-  [#8804](https://github.com/rust-lang/rust-clippy/pull/8804)
-* Moved [`assertions_on_result_states`] to restriction (now allow-by-default)
-  [#9273](https://github.com/rust-lang/rust-clippy/pull/9273)
-* Renamed `blacklisted_name` to [`disallowed_names`]
-  [#8974](https://github.com/rust-lang/rust-clippy/pull/8974)
-
-### Enhancements
-
-* [`option_if_let_else`]: Now also checks for match expressions
-  [#8696](https://github.com/rust-lang/rust-clippy/pull/8696)
-* [`explicit_auto_deref`]: Now lints on implicit returns in closures
-  [#9126](https://github.com/rust-lang/rust-clippy/pull/9126)
-* [`needless_borrow`]: Now considers trait implementations
-  [#9136](https://github.com/rust-lang/rust-clippy/pull/9136)
-* [`suboptimal_flops`], [`imprecise_flops`]: Now lint on constant expressions
-  [#9404](https://github.com/rust-lang/rust-clippy/pull/9404)
-* [`if_let_mutex`]: Now detects mutex behind references and warns about deadlocks
-  [#9318](https://github.com/rust-lang/rust-clippy/pull/9318)
-
-### False Positive Fixes
-
-* [`unit_arg`] [`default_trait_access`] [`missing_docs_in_private_items`]: No longer
-  trigger in code generated from proc-macros
-  [#8694](https://github.com/rust-lang/rust-clippy/pull/8694)
-* [`unwrap_used`]: Now lints uses of `unwrap_err`
-  [#9338](https://github.com/rust-lang/rust-clippy/pull/9338)
-* [`expect_used`]: Now lints uses of `expect_err`
-  [#9338](https://github.com/rust-lang/rust-clippy/pull/9338)
-* [`transmute_undefined_repr`]: Now longer lints if the first field is compatible
-  with the other type
-  [#9287](https://github.com/rust-lang/rust-clippy/pull/9287)
-* [`unnecessary_to_owned`]: No longer lints, if type change cased errors in
-  the caller function
-  [#9424](https://github.com/rust-lang/rust-clippy/pull/9424)
-* [`match_like_matches_macro`]: No longer lints, if there are comments inside the
-  match expression
-  [#9276](https://github.com/rust-lang/rust-clippy/pull/9276)
-* [`partialeq_to_none`]: No longer trigger in code generated from macros
-  [#9389](https://github.com/rust-lang/rust-clippy/pull/9389)
-* [`arithmetic_side_effects`]: No longer lints expressions that only use literals
-  [#9365](https://github.com/rust-lang/rust-clippy/pull/9365)
-* [`explicit_auto_deref`]: Now ignores references on block expressions when the type
-  is `Sized`, on `dyn Trait` returns and when the suggestion is non-trivial
-  [#9126](https://github.com/rust-lang/rust-clippy/pull/9126)
-* [`trait_duplication_in_bounds`]: Now better tracks bounds to avoid false positives
-  [#9167](https://github.com/rust-lang/rust-clippy/pull/9167)
-* [`format_in_format_args`]: Now suggests cases where the result is formatted again
-  [#9349](https://github.com/rust-lang/rust-clippy/pull/9349)
-* [`only_used_in_recursion`]: No longer lints on function without recursions and
-  takes external functions into account
-  [#8804](https://github.com/rust-lang/rust-clippy/pull/8804)
-* [`missing_const_for_fn`]: No longer lints in proc-macros
-  [#9308](https://github.com/rust-lang/rust-clippy/pull/9308)
-* [`non_ascii_literal`]: Allow non-ascii comments in tests and make sure `#[allow]`
-  attributes work in tests
-  [#9327](https://github.com/rust-lang/rust-clippy/pull/9327)
-* [`question_mark`]: No longer lint `if let`s with subpatterns
-  [#9348](https://github.com/rust-lang/rust-clippy/pull/9348)
-* [`needless_collect`]: No longer lints in loops
-  [#8992](https://github.com/rust-lang/rust-clippy/pull/8992)
-* [`mut_mutex_lock`]: No longer lints if the mutex is behind an immutable reference
-  [#9418](https://github.com/rust-lang/rust-clippy/pull/9418)
-* [`needless_return`]: Now ignores returns with arguments
-  [#9381](https://github.com/rust-lang/rust-clippy/pull/9381)
-* [`range_plus_one`], [`range_minus_one`]: Now ignores code with macros
-  [#9446](https://github.com/rust-lang/rust-clippy/pull/9446)
-* [`assertions_on_result_states`]: No longer lints on the unit type
-  [#9273](https://github.com/rust-lang/rust-clippy/pull/9273)
-
-### Suggestion Fixes/Improvements
-
-* [`unwrap_or_else_default`]: Now suggests `unwrap_or_default()` for empty strings
-  [#9421](https://github.com/rust-lang/rust-clippy/pull/9421)
-* [`if_then_some_else_none`]: Now also suggests `bool::then_some`
-  [#9289](https://github.com/rust-lang/rust-clippy/pull/9289)
-* [`redundant_closure_call`]: The suggestion now works for async closures
-  [#9053](https://github.com/rust-lang/rust-clippy/pull/9053)
-* [`suboptimal_flops`]: Now suggests parenthesis when they are required
-  [#9394](https://github.com/rust-lang/rust-clippy/pull/9394)
-* [`case_sensitive_file_extension_comparisons`]: Now suggests `map_or(..)` instead of `map(..).unwrap_or`
-  [#9341](https://github.com/rust-lang/rust-clippy/pull/9341)
-* Deprecated configuration values can now be updated automatically
-  [#9252](https://github.com/rust-lang/rust-clippy/pull/9252)
-* [`or_fun_call`]: Now suggest `Entry::or_default` for `Entry::or_insert(Default::default())`
-  [#9342](https://github.com/rust-lang/rust-clippy/pull/9342)
-* [`unwrap_used`]: Only suggests `expect` if [`expect_used`] is allowed
-  [#9223](https://github.com/rust-lang/rust-clippy/pull/9223)
-
-### ICE Fixes
-
-* Fix ICE in [`useless_format`] for literals
-  [#9406](https://github.com/rust-lang/rust-clippy/pull/9406)
-* Fix infinite loop in [`vec_init_then_push`]
-  [#9441](https://github.com/rust-lang/rust-clippy/pull/9441)
-* Fix ICE when reading literals with weird proc-macro spans
-  [#9303](https://github.com/rust-lang/rust-clippy/pull/9303)
+[3c7e7dbc...master](https://github.com/rust-lang/rust-clippy/compare/3c7e7dbc...master)
 
 ## Rust 1.64
 
-Released 2022-09-22
+Current stable, released 2022-09-22
 
 [d7b5cbf0...3c7e7dbc](https://github.com/rust-lang/rust-clippy/compare/d7b5cbf0...3c7e7dbc)
 
@@ -4047,7 +3903,6 @@ Released 2018-09-13
 [`format_push_string`]: https://rust-lang.github.io/rust-clippy/master/index.html#format_push_string
 [`from_iter_instead_of_collect`]: https://rust-lang.github.io/rust-clippy/master/index.html#from_iter_instead_of_collect
 [`from_over_into`]: https://rust-lang.github.io/rust-clippy/master/index.html#from_over_into
-[`from_raw_with_void_ptr`]: https://rust-lang.github.io/rust-clippy/master/index.html#from_raw_with_void_ptr
 [`from_str_radix_10`]: https://rust-lang.github.io/rust-clippy/master/index.html#from_str_radix_10
 [`future_not_send`]: https://rust-lang.github.io/rust-clippy/master/index.html#future_not_send
 [`get_first`]: https://rust-lang.github.io/rust-clippy/master/index.html#get_first
@@ -4123,7 +3978,6 @@ Released 2018-09-13
 [`len_zero`]: https://rust-lang.github.io/rust-clippy/master/index.html#len_zero
 [`let_and_return`]: https://rust-lang.github.io/rust-clippy/master/index.html#let_and_return
 [`let_underscore_drop`]: https://rust-lang.github.io/rust-clippy/master/index.html#let_underscore_drop
-[`let_underscore_future`]: https://rust-lang.github.io/rust-clippy/master/index.html#let_underscore_future
 [`let_underscore_lock`]: https://rust-lang.github.io/rust-clippy/master/index.html#let_underscore_lock
 [`let_underscore_must_use`]: https://rust-lang.github.io/rust-clippy/master/index.html#let_underscore_must_use
 [`let_unit_value`]: https://rust-lang.github.io/rust-clippy/master/index.html#let_unit_value
@@ -4142,8 +3996,6 @@ Released 2018-09-13
 [`manual_find_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_find_map
 [`manual_flatten`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_flatten
 [`manual_instant_elapsed`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_instant_elapsed
-[`manual_is_ascii_check`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_is_ascii_check
-[`manual_let_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_let_else
 [`manual_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_map
 [`manual_memcpy`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_memcpy
 [`manual_non_exhaustive`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_non_exhaustive
@@ -4197,7 +4049,6 @@ Released 2018-09-13
 [`missing_panics_doc`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_panics_doc
 [`missing_safety_doc`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_safety_doc
 [`missing_spin_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_spin_loop
-[`missing_trait_methods`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_trait_methods
 [`mistyped_literal_suffixes`]: https://rust-lang.github.io/rust-clippy/master/index.html#mistyped_literal_suffixes
 [`mixed_case_hex_literals`]: https://rust-lang.github.io/rust-clippy/master/index.html#mixed_case_hex_literals
 [`mixed_read_write_in_expression`]: https://rust-lang.github.io/rust-clippy/master/index.html#mixed_read_write_in_expression
@@ -4283,7 +4134,6 @@ Released 2018-09-13
 [`panic_in_result_fn`]: https://rust-lang.github.io/rust-clippy/master/index.html#panic_in_result_fn
 [`panic_params`]: https://rust-lang.github.io/rust-clippy/master/index.html#panic_params
 [`panicking_unwrap`]: https://rust-lang.github.io/rust-clippy/master/index.html#panicking_unwrap
-[`partial_pub_fields`]: https://rust-lang.github.io/rust-clippy/master/index.html#partial_pub_fields
 [`partialeq_ne_impl`]: https://rust-lang.github.io/rust-clippy/master/index.html#partialeq_ne_impl
 [`partialeq_to_none`]: https://rust-lang.github.io/rust-clippy/master/index.html#partialeq_to_none
 [`path_buf_push_overwrite`]: https://rust-lang.github.io/rust-clippy/master/index.html#path_buf_push_overwrite
@@ -4346,8 +4196,6 @@ Released 2018-09-13
 [`same_item_push`]: https://rust-lang.github.io/rust-clippy/master/index.html#same_item_push
 [`same_name_method`]: https://rust-lang.github.io/rust-clippy/master/index.html#same_name_method
 [`search_is_some`]: https://rust-lang.github.io/rust-clippy/master/index.html#search_is_some
-[`seek_from_current`]: https://rust-lang.github.io/rust-clippy/master/index.html#seek_from_current
-[`seek_to_start_instead_of_rewind`]: https://rust-lang.github.io/rust-clippy/master/index.html#seek_to_start_instead_of_rewind
 [`self_assignment`]: https://rust-lang.github.io/rust-clippy/master/index.html#self_assignment
 [`self_named_constructors`]: https://rust-lang.github.io/rust-clippy/master/index.html#self_named_constructors
 [`self_named_module_files`]: https://rust-lang.github.io/rust-clippy/master/index.html#self_named_module_files
@@ -4397,7 +4245,6 @@ Released 2018-09-13
 [`suspicious_splitn`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_splitn
 [`suspicious_to_owned`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_to_owned
 [`suspicious_unary_op_formatting`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_unary_op_formatting
-[`suspicious_xor_used_as_pow`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_xor_used_as_pow
 [`swap_ptr_to_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#swap_ptr_to_ref
 [`tabs_in_doc_comments`]: https://rust-lang.github.io/rust-clippy/master/index.html#tabs_in_doc_comments
 [`temporary_assignment`]: https://rust-lang.github.io/rust-clippy/master/index.html#temporary_assignment
@@ -4468,7 +4315,6 @@ Released 2018-09-13
 [`unstable_as_slice`]: https://rust-lang.github.io/rust-clippy/master/index.html#unstable_as_slice
 [`unused_async`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_async
 [`unused_collect`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_collect
-[`unused_format_specs`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_format_specs
 [`unused_io_amount`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_io_amount
 [`unused_label`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_label
 [`unused_peekable`]: https://rust-lang.github.io/rust-clippy/master/index.html#unused_peekable

CODE_OF_CONDUCT.md

@@ -1,3 +1,70 @@
 # The Rust Code of Conduct
 
-The Code of Conduct for this repository [can be found online](https://www.rust-lang.org/conduct.html).
+A version of this document [can be found online](https://www.rust-lang.org/conduct.html).
+
+## Conduct
+
+**Contact**: [[email protected]](mailto:[email protected])
+
+* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience,
+  gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
+  religion, nationality, or other similar characteristic.
+* On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and
+  welcoming environment for all.
+* Please be kind and courteous. There's no need to be mean or rude.
+* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and
+  numerous costs. There is seldom a right answer.
+* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and
+  see how it works.
+* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We
+  interpret the term "harassment" as including the definition in the <a href="http://citizencodeofconduct.org/">Citizen
+  Code of Conduct</a>; if you have any lack of clarity about what might be included in that concept, please read their
+  definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
+* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or
+  made uncomfortable by a community member, please contact one of the channel ops or any of the [Rust moderation
+  team][mod_team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a
+  safe place for you and we've got your back.
+* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
+
+## Moderation
+
+
+These are the policies for upholding our community's standards of conduct. If you feel that a thread needs moderation,
+please contact the [Rust moderation team][mod_team].
+
+1. Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks,
+   are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
+2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
+3. Moderators will first respond to such remarks with a warning.
+4. If the warning is unheeded, the user will be "kicked," i.e., kicked out of the communication channel to cool off.
+5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
+6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended
+   party a genuine apology.
+7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a
+   different moderator, **in private**. Complaints about bans in-channel are not allowed.
+8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate
+   situation, they should expect less leeway than others.
+
+In the Rust community we strive to go the extra step to look out for each other. Don't just aim to be technically
+unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly
+if they're off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can
+drive people away from the community entirely.
+
+And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was
+they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good
+there was something you could've communicated better — remember that it's your responsibility to make your fellow
+Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about
+cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their
+trust.
+
+The enforcement policies listed above apply to all official Rust venues; including official IRC channels (#rust,
+#rust-internals, #rust-tools, #rust-libs, #rustc, #rust-beginners, #rust-docs, #rust-community, #rust-lang, and #cargo);
+GitHub repositories under rust-lang, rust-lang-nursery, and rust-lang-deprecated; and all forums under rust-lang.org
+(users.rust-lang.org, internals.rust-lang.org). For other projects adopting the Rust Code of Conduct, please contact the
+maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider
+explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion.
+
+*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the
+[Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
+
+[mod_team]: https://www.rust-lang.org/team.html#Moderation-team