Skip to content

Commit

Permalink
Auto merge of #10646 - koic:use_rust_2021_prelude, r=epage
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed May 10, 2022
2 parents cc9e301 + 1626762 commit b3f6772
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion crates/mdman/src/hbs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use handlebars::{
RenderContext, RenderError, Renderable,
};
use std::collections::HashMap;
use std::convert::TryFrom;
use std::path::Path;

type FormatterRef<'a> = &'a (dyn Formatter + Send + Sync);
Expand Down
1 change: 0 additions & 1 deletion src/cargo/core/compiler/fingerprint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@
//! <https://github.com/rust-lang/cargo/issues?q=is%3Aissue+is%3Aopen+label%3AA-rebuild-detection>

use std::collections::hash_map::{Entry, HashMap};
use std::convert::TryInto;
use std::env;
use std::hash::{self, Hash, Hasher};
use std::io;
Expand Down
1 change: 0 additions & 1 deletion src/cargo/sources/registry/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ use cargo_util::{paths, registry::make_dep_path};
use log::{debug, info};
use semver::Version;
use std::collections::{HashMap, HashSet};
use std::convert::TryInto;
use std::fs;
use std::io::ErrorKind;
use std::path::Path;
Expand Down
1 change: 0 additions & 1 deletion tests/testsuite/dep_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use cargo_test_support::{
basic_bin_manifest, basic_manifest, is_nightly, main_file, project, rustc_host, Project,
};
use filetime::FileTime;
use std::convert::TryInto;
use std::fs;
use std::path::Path;
use std::str;
Expand Down

0 comments on commit b3f6772

Please sign in to comment.