Rebase attempt 3

Author: ofeeg

CHANGELOG.md

@@ -71,27 +71,9 @@ If you have any feedback related to the new format, please share it in
 
 ## Rust 1.70
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 Released 2023-06-01
 
 [View all 91 merged pull requests](https://github.com/rust-lang/rust-clippy/pulls?q=merged%3A2023-02-26T01%3A05%3A43Z..2023-04-11T13%3A27%3A30Z+base%3Amaster)
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-Current stable, released 2023-06-01
-=======
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
-Released 2023-06-01
-
-[View all 91 merged pull requests](https://github.com/rust-lang/rust-clippy/pulls?q=merged%3A2023-02-26T01%3A05%3A43Z..2023-04-11T13%3A27%3A30Z+base%3Amaster)
-<<<<<<< HEAD
->>>>>>> 28655266b (Fix changelog PR listings, create them automatically in `fetch_prs_between.sh`)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 
 ### New Lints
 
@@ -149,23 +131,7 @@ Released 2023-06-01
   [#10309](https://github.com/rust-lang/rust-clippy/pull/10309)
 * [`items_after_statements`]: `#[allow(items_after_statements)]` now works on items
   [#10542](https://github.com/rust-lang/rust-clippy/pull/10542)
-<<<<<<< HEAD
-<<<<<<< HEAD
-* [`significant_drop_tightening`]: Was optimized
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
 * [`significant_drop_tightening`]: Was optimized
-=======
-* [`significant_drop_tightening`]: was optimized
->>>>>>> 4d9303df1 (Changelog for Rust 1.70 :hammer:)
-=======
-* [`significant_drop_tightening`]: Was optimized
->>>>>>> 7dd0ae026 (Change changelog typos)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
-* [`significant_drop_tightening`]: Was optimized
->>>>>>> 615b25c20 (Rebase attempt number 2)
   [#10533](https://github.com/rust-lang/rust-clippy/pull/10533)
 
 ### False Positive Fixes
@@ -186,38 +152,11 @@ Released 2023-06-01
   [#10527](https://github.com/rust-lang/rust-clippy/pull/10527)
 * [`needless_return`]: No longer lints match statements with incompatible branches
   [#10593](https://github.com/rust-lang/rust-clippy/pull/10593)
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 * [`use_self`]: Do not suggest using `Self` in const generic parameters
   [#10375](https://github.com/rust-lang/rust-clippy/pull/10375)
 * [`mem_replace_option_with_none`]: No longer lints on field expressions
   [#10594](https://github.com/rust-lang/rust-clippy/pull/10594)
 * [`items_after_statements`]: No longer lints on items from macros
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
-* [`use_self`]: do not suggest using `Self` in const generic parameters
-=======
-* [`use_self`]: Do not suggest using `Self` in const generic parameters
->>>>>>> 7dd0ae026 (Change changelog typos)
-  [#10375](https://github.com/rust-lang/rust-clippy/pull/10375)
-* [`mem_replace_option_with_none`]: No longer lints on field expressions
-  [#10594](https://github.com/rust-lang/rust-clippy/pull/10594)
-* [`items_after_statements`]: No longer lints on times from macros
->>>>>>> 4d9303df1 (Changelog for Rust 1.70 :hammer:)
-=======
->>>>>>> a28eb5995 (Update *Current stable* text in `CHANGELOG.md`)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
   [#10542](https://github.com/rust-lang/rust-clippy/pull/10542)
 * [`print_literal`], [`write_literal`]: No longer lint strings coming from the `file!()` macro
   [#10573](https://github.com/rust-lang/rust-clippy/pull/10573)
@@ -309,19 +248,7 @@ Released 2023-04-20
 
 * [`explicit_auto_deref`]: Now considers projections when determining if auto deref is applicable
   [#10386](https://github.com/rust-lang/rust-clippy/pull/10386)
-<<<<<<< HEAD
-<<<<<<< HEAD
 * [`manual_let_else`]: Now considers side effects of branches before linting
-=======
-<<<<<<< HEAD
-* [`manual_let_else`]: Now considers side effects of branches before linting 
-=======
-* [`manual_let_else`]: Now considers side effects of branches before linting
->>>>>>> 7e9abb311 (Merge commit '371120bdbf58a331db5dcfb2d9cddc040f486de8' into clippyup)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
-* [`manual_let_else`]: Now considers side effects of branches before linting
->>>>>>> 615b25c20 (Rebase attempt number 2)
   [#10336](https://github.com/rust-lang/rust-clippy/pull/10336)
 * [`uninlined_format_args`]: No longer lints for arguments with generic parameters
   [#10343](https://github.com/rust-lang/rust-clippy/pull/10343)
@@ -4893,23 +4820,7 @@ Released 2018-09-13
 [`erasing_op`]: https://rust-lang.github.io/rust-clippy/master/index.html#erasing_op
 [`err_expect`]: https://rust-lang.github.io/rust-clippy/master/index.html#err_expect
 [`eval_order_dependence`]: https://rust-lang.github.io/rust-clippy/master/index.html#eval_order_dependence
-<<<<<<< HEAD
-<<<<<<< HEAD
-[`excessive_nesting`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_nesting
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
 [`excessive_nesting`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_nesting
-=======
-[`excessive_indentation`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_indentation
->>>>>>> 97c10075e (add the `excessive_*` style lints)
-=======
-[`excessive_nesting`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_nesting
->>>>>>> e68dbc330 (add `excessive_nesting`)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
-[`excessive_nesting`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_nesting
->>>>>>> 615b25c20 (Rebase attempt number 2)
 [`excessive_precision`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_precision
 [`exhaustive_enums`]: https://rust-lang.github.io/rust-clippy/master/index.html#exhaustive_enums
 [`exhaustive_structs`]: https://rust-lang.github.io/rust-clippy/master/index.html#exhaustive_structs
@@ -5076,23 +4987,7 @@ Released 2018-09-13
 [`manual_non_exhaustive`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_non_exhaustive
 [`manual_ok_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_ok_or
 [`manual_range_contains`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_contains
-<<<<<<< HEAD
-<<<<<<< HEAD
-[`manual_range_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_patterns
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-[`manual_range_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_patterns
-=======
-[`manual_range_pattern`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_pattern
->>>>>>> 1d4afc5d8 (new lint: `manual_range_pattern`)
-=======
 [`manual_range_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_patterns
->>>>>>> b592d3996 (manual_range_pattern -> manual_range_patterns)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
-[`manual_range_patterns`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_patterns
->>>>>>> 615b25c20 (Rebase attempt number 2)
 [`manual_rem_euclid`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_rem_euclid
 [`manual_retain`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_retain
 [`manual_saturating_arithmetic`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_saturating_arithmetic
@@ -5196,22 +5091,7 @@ Released 2018-09-13
 [`needless_question_mark`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_question_mark
 [`needless_range_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_range_loop
 [`needless_raw_string_hashes`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_raw_string_hashes
-<<<<<<< HEAD
-<<<<<<< HEAD
-[`needless_raw_strings`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_raw_strings
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-[`needless_raw_strings`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_raw_strings
-=======
->>>>>>> 1bf74fc30 (add `needless_raw_string_hashes` lint)
-=======
 [`needless_raw_strings`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_raw_strings
->>>>>>> 8cb6c8699 (change category and refactor)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
-[`needless_raw_strings`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_raw_strings
->>>>>>> 615b25c20 (Rebase attempt number 2)
 [`needless_return`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_return
 [`needless_splitn`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_splitn
 [`needless_update`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_update
@@ -5580,34 +5460,7 @@ Released 2018-09-13
 [`allow-private-module-inception`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allow-private-module-inception
 [`allowed-idents-below-min-chars`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allowed-idents-below-min-chars
 [`min-ident-chars-threshold`]: https://doc.rust-lang.org/clippy/lint_configuration.html#min-ident-chars-threshold
-<<<<<<< HEAD
-<<<<<<< HEAD
-[`accept-comment-above-statement`]: https://doc.rust-lang.org/clippy/lint_configuration.html#accept-comment-above-statement
-[`accept-comment-above-attributes`]: https://doc.rust-lang.org/clippy/lint_configuration.html#accept-comment-above-attributes
-[`allow-one-hash-in-raw-strings`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allow-one-hash-in-raw-strings
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 [`accept-comment-above-statement`]: https://doc.rust-lang.org/clippy/lint_configuration.html#accept-comment-above-statement
 [`accept-comment-above-attributes`]: https://doc.rust-lang.org/clippy/lint_configuration.html#accept-comment-above-attributes
 [`allow-one-hash-in-raw-strings`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allow-one-hash-in-raw-strings
-<<<<<<< HEAD
-=======
->>>>>>> d5b2f1134 (Now `cargo collect-metadata` updates the `CHANGELOG.md`)
-=======
-[`accept-comment-above-statement`]: https://doc.rust-lang.org/clippy/lint_configuration.html#accept-comment-above-statement
->>>>>>> d6102018b (Collecting metadata)
-=======
->>>>>>> cc2e49f69 (allow safety comment above attributes)
-=======
-[`allow-one-hash-in-raw-string`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allow-one-hash-in-raw-string
->>>>>>> cb52d19ce (don't lint `needless_raw_string_hashes` when it's unnecessary)
-=======
-[`allow-one-hash-in-raw-strings`]: https://doc.rust-lang.org/clippy/lint_configuration.html#allow-one-hash-in-raw-strings
->>>>>>> 8cb6c8699 (change category and refactor)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 <!-- end autogenerated links to configuration documentation -->

Cargo.toml

@@ -34,33 +34,12 @@ toml = "0.7.3"
 walkdir = "2.3"
 # This is used by the `collect-metadata` alias.
 filetime = "0.2"
-<<<<<<< HEAD
-<<<<<<< HEAD
 itertools = "0.10.1"
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 0567691cb (This commit resolves issue #10655)
 
 # UI test dependencies
 clippy_utils = { path = "clippy_utils" }
 derive-new = "0.5"
 if_chain = "1.0"
-<<<<<<< HEAD
-=======
->>>>>>> 066037b62 (actually, remove rustc-workspace-hack dependency too)
-=======
->>>>>>> 514b6d04b (Port clippy away from compiletest to ui_test)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
-itertools = "0.10.1"
-
-# UI test dependencies
-clippy_utils = { path = "clippy_utils" }
-derive-new = "0.5"
-if_chain = "1.0"
->>>>>>> 0567691cb (This commit resolves issue #10655)
 quote = "1.0"
 serde = { version = "1.0.125", features = ["derive"] }
 syn = { version = "2.0", features = ["full"] }

book/src/configuration.md

@@ -2,16 +2,6 @@
 
 > **Note:** The configuration file is unstable and may be deprecated in the future.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 194343fce (Explain path-search using a list)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 Some lints can be configured in a TOML file named `clippy.toml` or `.clippy.toml`, which is searched for in:
 
 1. The directory specified by the `CLIPPY_CONF_DIR` environment variable, or
@@ -20,21 +10,6 @@ Some lints can be configured in a TOML file named `clippy.toml` or `.clippy.toml
 3. The current directory.
 
 It contains a basic `variable = value` mapping e.g.
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
-Some lints can be configured in a TOML file named `clippy.toml` or `.clippy.toml`, placed in a directory specified by
-the environment variable `CLIPPY_CONF_DIR`, or if that's not found, the environment variable
-[CARGO_MANIFEST_DIR](https://doc.rust-lang.org/cargo/reference/environment-variables.html), or if that isn't
-found, the current directory. It contains a basic `variable = value` mapping e.g.
->>>>>>> 5f5e2e2ac (Explain which paths clippy searches for configuration in docs)
-=======
->>>>>>> 194343fce (Explain path-search using a list)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 
 ```toml
 avoid-breaking-exported-api = false

book/src/development/adding_lints.md

@@ -627,16 +627,6 @@ Before submitting your PR make sure you followed all the basic requirements:
 
 ## Adding configuration to a lint
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 194343fce (Explain path-search using a list)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 Clippy supports the configuration of lints values using a `clippy.toml` file which is searched for in:
 
 1. The directory specified by the `CLIPPY_CONF_DIR` environment variable, or
@@ -645,21 +635,6 @@ Clippy supports the configuration of lints values using a `clippy.toml` file whi
 3. The current directory.
 
 Adding a configuration to a lint can be useful for
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
-Clippy supports the configuration of lints values using a `clippy.toml` file in a directory specified by
-the environment variable `CLIPPY_CONF_DIR`, or if that's not found, the environment variable
-[CARGO_MANIFEST_DIR](https://doc.rust-lang.org/cargo/reference/environment-variables.html), or if that isn't
-found, the current directory. Adding a configuration to a lint can be useful for
->>>>>>> 5f5e2e2ac (Explain which paths clippy searches for configuration in docs)
-=======
->>>>>>> 194343fce (Explain path-search using a list)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
->>>>>>> 615b25c20 (Rebase attempt number 2)
 thresholds or to constrain some behavior that can be seen as a false positive
 for some users. Adding a configuration is done in the following steps:
 

book/src/development/lint_passes.md

@@ -50,23 +50,7 @@ questions already, but the parser is okay with it. This is what we
 mean when we say `EarlyLintPass` deals with only syntax on the AST level.
 
 Alternatively, think of the `foo_functions` lint we mentioned in
-<<<<<<< HEAD
-<<<<<<< HEAD
 define new lints <!-- FIXME: add link --> chapter.
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-define new lints chapter.
-=======
-define new lints <!-- FIXME: add link --> chapter.
->>>>>>> d1f55e6b5 (run linkcheck in Remark CI)
-=======
-define new lints <!-- FIXME: add link --> chapter.
->>>>>>> 7e9abb311 (Merge commit '371120bdbf58a331db5dcfb2d9cddc040f486de8' into clippyup)
->>>>>>> 0567691cb (This commit resolves issue #10655)
-=======
-define new lints <!-- FIXME: add link --> chapter.
->>>>>>> 615b25c20 (Rebase attempt number 2)
 
 We want the `foo_functions` lint to detect functions with `foo` as their name.
 Writing a lint that only checks for the name of a function means that we only