diff options
| author | bors <bors@rust-lang.org> | 2020-05-16 20:17:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-16 20:17:11 +0000 |
| commit | cfd720d506bee262130f86db814d840fd1ef2495 (patch) | |
| tree | eae07f663a84dae744e0272f41a24f2159c213a5 /src/test/rustdoc-js-std/string-from_ut.js | |
| parent | 0c9427309ce0c647ee32cd4c88ca5902b57fb7ee (diff) | |
| parent | ab87f87ba03518da23ca510249aa3f5908a42368 (diff) | |
| download | rust-cfd720d506bee262130f86db814d840fd1ef2495.tar.gz rust-cfd720d506bee262130f86db814d840fd1ef2495.zip | |
Auto merge of #5563 - ThibsG:MergeLints, r=flip1995
Merge some lints together This PR merges following lints: - `block_in_if_condition_expr` and `block_in_if_condition_stmt` → `blocks_in_if_conditions` - `option_map_unwrap_or`, `option_map_unwrap_or_else` and `result_map_unwrap_or_else` → `map_unwrap` - `option_unwrap_used` and `result_unwrap_used` → `unwrap_used` - `option_expect_used` and `result_expect_used` → `expect_used` - `wrong_pub_self_convention` into `wrong_self_convention` - `for_loop_over_option` and `for_loop_over_result` → `for_loops_over_fallibles` Lints that have already been merged since the issue was created: - [x] `new_without_default` and `new_without_default_derive` → `new_without_default` Need more discussion: - `string_add` and `string_add_assign`: do we agree to merge them or not? Is there something more to do? → **not merge finally** - `identity_op` and `modulo_one` → `useless_arithmetic`: seems outdated, since `modulo_arithmetic` has been created. fixes #1078 changelog: Merging some lints together: - `block_in_if_condition_expr` and `block_in_if_condition_stmt` → `blocks_in_if_conditions` - `option_map_unwrap_or`, `option_map_unwrap_or_else` and `result_map_unwrap_or_else` → `map_unwrap_or` - `option_unwrap_used` and `result_unwrap_used` → `unwrap_used` - `option_expect_used` and `result_expect_used` → `expect_used` - `for_loop_over_option` and `for_loop_over_result` → `for_loops_over_fallibles`
Diffstat (limited to 'src/test/rustdoc-js-std/string-from_ut.js')
0 files changed, 0 insertions, 0 deletions