Skip to content

Commit a44fa38

Browse files
committed
Update documentation on changelog updates
1 parent 6955420 commit a44fa38

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

CHANGELOG.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ Current beta, release 2020-07-16
3131
* Downgrade [`match_bool`] to pedantic [#5408](https://github.com/rust-lang/rust-clippy/pull/5408)
3232
* Downgrade [`match_wild_err_arm`] to pedantic and update help messages. [#5622](https://github.com/rust-lang/rust-clippy/pull/5622)
3333
* Downgrade [`useless_let_if_seq`] to nursery. [#5599](https://github.com/rust-lang/rust-clippy/pull/5599)
34-
* Generalize [`option_and_then_some`] and rename to [`bind_instead_of_map`]. [#5529](https://github.com/rust-lang/rust-clippy/pull/5529)
35-
* Rename [`identity_conversion`] to [`useless_conversion`]. [#5568](https://github.com/rust-lang/rust-clippy/pull/5568)
36-
* Merge [`block_in_if_condition_expr`] and [`block_in_if_condition_stmt`] into [`blocks_in_if_conditions`].
34+
* Generalize `option_and_then_some` and rename to [`bind_instead_of_map`]. [#5529](https://github.com/rust-lang/rust-clippy/pull/5529)
35+
* Rename `identity_conversion` to [`useless_conversion`]. [#5568](https://github.com/rust-lang/rust-clippy/pull/5568)
36+
* Merge `block_in_if_condition_expr` and `block_in_if_condition_stmt` into [`blocks_in_if_conditions`].
3737
[#5563](https://github.com/rust-lang/rust-clippy/pull/5563)
38-
* Merge [`option_map_unwrap_or`], [`option_map_unwrap_or_else`] and [`result_map_unwrap_or_else`] into [`map_unwrap_or`].
38+
* Merge `option_map_unwrap_or`, `option_map_unwrap_or_else` and `result_map_unwrap_or_else` into [`map_unwrap_or`].
3939
[#5563](https://github.com/rust-lang/rust-clippy/pull/5563)
40-
* Merge [`option_unwrap_used`] and [`result_unwrap_used`] into [`unwrap_used`].
40+
* Merge `option_unwrap_used` and `result_unwrap_used` into [`unwrap_used`].
4141
[#5563](https://github.com/rust-lang/rust-clippy/pull/5563)
42-
* Merge [`option_expect_used`] and [`result_expect_used`] into [`expect_used`].
42+
* Merge `option_expect_used` and `result_expect_used` into [`expect_used`].
4343
[#5563](https://github.com/rust-lang/rust-clippy/pull/5563)
44-
* Merge [`for_loop_over_option`] and [`for_loop_over_result`] into [`for_loops_over_fallibles`].
44+
* Merge `for_loop_over_option` and `for_loop_over_result` into [`for_loops_over_fallibles`].
4545
[#5563](https://github.com/rust-lang/rust-clippy/pull/5563)
4646

4747
### Enhancements
@@ -61,10 +61,11 @@ Current beta, release 2020-07-16
6161
* Don't trigger [`borrowed_box`] on mutable references. [#5491](https://github.com/rust-lang/rust-clippy/pull/5491)
6262
* Allow `1 << 0` in [`identity_op`]. [#5602](https://github.com/rust-lang/rust-clippy/pull/5602)
6363
* Allow `use super::*;` glob imports in [`wildcard_imports`]. [#5564](https://github.com/rust-lang/rust-clippy/pull/5564)
64-
* Add ignores to the list of words of [`clippy::doc_markdown`]. [#5611](https://github.com/rust-lang/rust-clippy/pull/5611)
64+
* Add ignores to the list of words of [`doc_markdown`]. [#5611](https://github.com/rust-lang/rust-clippy/pull/5611)
6565
* Skip dev and build deps in [`multiple_crate_versions`]. [#5636](https://github.com/rust-lang/rust-clippy/pull/5636)
6666
* Honor `allow` attribute on arguments in [`ptr_arg`]. [#5647](https://github.com/rust-lang/rust-clippy/pull/5647)
67-
* Honor lint level attributes for [`redundant_field_names`] and [`non_expressive_names`]. [#5651](https://github.com/rust-lang/rust-clippy/pull/5651)
67+
* Honor lint level attributes for [`redundant_field_names`], [`just_underscores_and_digits`], [`many_single_char_names`]
68+
and [`similar_names`]. [#5651](https://github.com/rust-lang/rust-clippy/pull/5651)
6869
* Ignore calls to `len` in [`or_fun_call`]. [#4429](https://github.com/rust-lang/rust-clippy/pull/4429)
6970

7071
### Suggestion Improvements

doc/changelog_update.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ bullet points might be helpful:
3232
need to select the Rust release tag from the dropdown and then check the
3333
commit of the Clippy directory:
3434

35-
![Explanation of how to find the commit hash](https://user-images.githubusercontent.com/2042399/62846160-1f8b0480-bcce-11e9-9da8-7964ca034e7a.png)
36-
35+
To find the commit hash, click on "History" of the relevant branch in github
36+
and search for the latest "Merge commit '<hash>' into <branch>" commit.
37+
The <hash> part is then the most recent commit in the clippy repo.
3738

3839
### 2. Fetching the PRs between those commits
3940

@@ -74,5 +75,5 @@ relevant commit ranges.
7475

7576
[changelog]: https://github.com/rust-lang/rust-clippy/blob/master/CHANGELOG.md
7677
[forge]: https://forge.rust-lang.org/
77-
[rust_master_tools]: https://github.com/rust-lang/rust/tree/master/src/tools
78-
[rust_beta_tools]: https://github.com/rust-lang/rust/tree/beta/src/tools
78+
[rust_master_tools]: https://github.com/rust-lang/rust/tree/master/src/tools/clippy
79+
[rust_beta_tools]: https://github.com/rust-lang/rust/tree/beta/src/tools/clippy

0 commit comments

Comments
 (0)