Skip to content

Commit b3f6772

Browse files
committed
Auto merge of #10646 - koic:use_rust_2021_prelude, r=epage
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
2 parents cc9e301 + 1626762 commit b3f6772

File tree

4 files changed

+0
-4
lines changed

4 files changed

+0
-4
lines changed

crates/mdman/src/hbs.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use handlebars::{
77
RenderContext, RenderError, Renderable,
88
};
99
use std::collections::HashMap;
10-
use std::convert::TryFrom;
1110
use std::path::Path;
1211

1312
type FormatterRef<'a> = &'a (dyn Formatter + Send + Sync);

src/cargo/core/compiler/fingerprint.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@
313313
//! <https://github.com/rust-lang/cargo/issues?q=is%3Aissue+is%3Aopen+label%3AA-rebuild-detection>
314314
315315
use std::collections::hash_map::{Entry, HashMap};
316-
use std::convert::TryInto;
317316
use std::env;
318317
use std::hash::{self, Hash, Hasher};
319318
use std::io;

src/cargo/sources/registry/index.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ use cargo_util::{paths, registry::make_dep_path};
7676
use log::{debug, info};
7777
use semver::Version;
7878
use std::collections::{HashMap, HashSet};
79-
use std::convert::TryInto;
8079
use std::fs;
8180
use std::io::ErrorKind;
8281
use std::path::Path;

tests/testsuite/dep_info.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use cargo_test_support::{
88
basic_bin_manifest, basic_manifest, is_nightly, main_file, project, rustc_host, Project,
99
};
1010
use filetime::FileTime;
11-
use std::convert::TryInto;
1211
use std::fs;
1312
use std::path::Path;
1413
use std::str;

0 commit comments

Comments
 (0)