Skip to content

Commit a3d1f28

Browse files
committed
Auto merge of #8818 - koic:use_rust_2021_prelude, r=flip1995
Use the traits added to the Rust 2021 Edition prelude Follow up rust-lang/rust#96861. This PR uses the traits added to the Rust 2021 Edition prelude. > The `TryInto`, `TryFrom` and `FromIterator` traits are now part of the prelude. https://doc.rust-lang.org/edition-guide/rust-2021/prelude.html --- changelog: none
2 parents 6889d09 + ae0216d commit a3d1f28

34 files changed

+99
-128
lines changed

clippy_lints/src/checked_conversions.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ declare_clippy_lint! {
3030
/// Could be written:
3131
///
3232
/// ```rust
33-
/// # use std::convert::TryFrom;
3433
/// # let foo = 1;
3534
/// # let _ =
3635
/// i32::try_from(foo).is_ok()

clippy_lints/src/enum_clike.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use rustc_lint::{LateContext, LateLintPass};
88
use rustc_middle::ty::util::IntTypeExt;
99
use rustc_middle::ty::{self, IntTy, UintTy};
1010
use rustc_session::{declare_lint_pass, declare_tool_lint};
11-
use std::convert::TryFrom;
1211

1312
declare_clippy_lint! {
1413
/// ### What it does

clippy_lints/src/excessive_bools.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ use rustc_lint::{EarlyContext, EarlyLintPass};
44
use rustc_session::{declare_tool_lint, impl_lint_pass};
55
use rustc_span::{sym, Span};
66

7-
use std::convert::TryInto;
8-
97
declare_clippy_lint! {
108
/// ### What it does
119
/// Checks for excessive

clippy_lints/src/fallible_impl_from.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ declare_clippy_lint! {
3232
/// // Good
3333
/// struct Foo(i32);
3434
///
35-
/// use std::convert::TryFrom;
3635
/// impl TryFrom<String> for Foo {
3736
/// type Error = ();
3837
/// fn try_from(s: String) -> Result<Self, Self::Error> {

clippy_lints/src/index_refutable_slice.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ use rustc_middle::ty;
1414
use rustc_semver::RustcVersion;
1515
use rustc_session::{declare_tool_lint, impl_lint_pass};
1616
use rustc_span::{symbol::Ident, Span};
17-
use std::convert::TryInto;
1817

1918
declare_clippy_lint! {
2019
/// ### What it does

clippy_lints/src/methods/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,8 +1776,6 @@ declare_clippy_lint! {
17761776
///
17771777
/// ### Example
17781778
/// ```rust
1779-
/// use std::iter::FromIterator;
1780-
///
17811779
/// let five_fives = std::iter::repeat(5).take(5);
17821780
///
17831781
/// let v = Vec::from_iter(five_fives);

clippy_lints/src/redundant_clone.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use rustc_mir_dataflow::{Analysis, AnalysisDomain, CallReturnPlaces, GenKill, Ge
1919
use rustc_session::{declare_lint_pass, declare_tool_lint};
2020
use rustc_span::source_map::{BytePos, Span};
2121
use rustc_span::sym;
22-
use std::convert::TryFrom;
2322
use std::ops::ControlFlow;
2423

2524
macro_rules! unwrap_or_continue {

clippy_lints/src/regex.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use rustc_hir::{BorrowKind, Expr, ExprKind};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::{declare_lint_pass, declare_tool_lint};
99
use rustc_span::source_map::{BytePos, Span};
10-
use std::convert::TryFrom;
1110

1211
declare_clippy_lint! {
1312
/// ### What it does

clippy_lints/src/tabs_in_doc_comments.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use rustc_errors::Applicability;
44
use rustc_lint::{EarlyContext, EarlyLintPass};
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
66
use rustc_span::source_map::{BytePos, Span};
7-
use std::convert::TryFrom;
87

98
declare_clippy_lint! {
109
/// ### What it does

clippy_utils/src/consts.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use rustc_middle::ty::{self, FloatTy, ScalarInt, Ty, TyCtxt};
1313
use rustc_middle::{bug, span_bug};
1414
use rustc_span::symbol::Symbol;
1515
use std::cmp::Ordering::{self, Equal};
16-
use std::convert::TryInto;
1716
use std::hash::{Hash, Hasher};
1817
use std::iter;
1918

0 commit comments

Comments
 (0)