mirror of
https://github.com/rust-lang/rust
synced 2024-10-14 12:33:57 +00:00
Rollup merge of #58830 - Centril:rust_2018_idioms-tidy, r=oli-obk
tidy: deny(rust_2018_idioms) r? @oli-obk
This commit is contained in:
commit
2c1a7c132b
|
@ -49,13 +49,13 @@
|
|||
];
|
||||
|
||||
/// Which crates to check against the whitelist?
|
||||
const WHITELIST_CRATES: &[CrateVersion] = &[
|
||||
const WHITELIST_CRATES: &[CrateVersion<'_>] = &[
|
||||
CrateVersion("rustc", "0.0.0"),
|
||||
CrateVersion("rustc_codegen_llvm", "0.0.0"),
|
||||
];
|
||||
|
||||
/// Whitelist of crates rustc is allowed to depend on. Avoid adding to the list if possible.
|
||||
const WHITELIST: &[Crate] = &[
|
||||
const WHITELIST: &[Crate<'_>] = &[
|
||||
Crate("adler32"),
|
||||
Crate("aho-corasick"),
|
||||
Crate("arrayvec"),
|
||||
|
@ -183,7 +183,7 @@ struct ResolveNode {
|
|||
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Hash)]
|
||||
struct CrateVersion<'a>(&'a str, &'a str); // (name, version)
|
||||
|
||||
impl<'a> Crate<'a> {
|
||||
impl Crate<'_> {
|
||||
pub fn id_str(&self) -> String {
|
||||
format!("{} ", self.0)
|
||||
}
|
||||
|
@ -330,10 +330,10 @@ fn get_deps(path: &Path, cargo: &Path) -> Resolve {
|
|||
|
||||
/// Checks the dependencies of the given crate from the given cargo metadata to see if they are on
|
||||
/// the whitelist. Returns a list of illegal dependencies.
|
||||
fn check_crate_whitelist<'a, 'b>(
|
||||
whitelist: &'a HashSet<Crate>,
|
||||
fn check_crate_whitelist<'a>(
|
||||
whitelist: &'a HashSet<Crate<'_>>,
|
||||
resolve: &'a Resolve,
|
||||
visited: &'b mut BTreeSet<CrateVersion<'a>>,
|
||||
visited: &mut BTreeSet<CrateVersion<'a>>,
|
||||
krate: CrateVersion<'a>,
|
||||
must_be_on_whitelist: bool,
|
||||
) -> BTreeSet<Crate<'a>> {
|
||||
|
|
|
@ -22,7 +22,7 @@ pub enum Status {
|
|||
}
|
||||
|
||||
impl fmt::Display for Status {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
let as_str = match *self {
|
||||
Status::Stable => "stable",
|
||||
Status::Unstable => "unstable",
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
//! This library contains the tidy lints and exposes it
|
||||
//! to be used by tools.
|
||||
|
||||
extern crate serde;
|
||||
#![deny(rust_2018_idioms)]
|
||||
|
||||
extern crate serde_json;
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
|
Loading…
Reference in a new issue