bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #58830 - Centril:rust_2018_idioms-tidy, r=oli-obk

Browse source 
tidy: deny(rust_2018_idioms)

r? @oli-obk
This commit is contained in:
kennytm 2019-03-02 14:55:19 +08:00
commit 2c1a7c132b
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tools/tidy/src/deps.rs
View file

@ -49,13 +49,13 @@ const EXCEPTIONS: &[&str] = &[
]; ];
/// Which crates to check against the whitelist? /// Which crates to check against the whitelist?
const WHITELIST_CRATES: &[CrateVersion] = &[ const WHITELIST_CRATES: &[CrateVersion<'_>] = &[
CrateVersion("rustc", "0.0.0"), CrateVersion("rustc", "0.0.0"),
CrateVersion("rustc_codegen_llvm", "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. /// 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("adler32"),
Crate("aho-corasick"), Crate("aho-corasick"),
Crate("arrayvec"), Crate("arrayvec"),
@ -183,7 +183,7 @@ struct Crate<'a>(&'a str); // (name)
#[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Hash)] #[derive(Copy, Clone, PartialOrd, Ord, PartialEq, Eq, Debug, Hash)]
struct CrateVersion<'a>(&'a str, &'a str); // (name, version) struct CrateVersion<'a>(&'a str, &'a str); // (name, version)
impl<'a> Crate<'a> { impl Crate<'_> {
pub fn id_str(&self) -> String { pub fn id_str(&self) -> String {
format!("{} ", self.0) 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 /// 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. /// the whitelist. Returns a list of illegal dependencies.
fn check_crate_whitelist<'a, 'b>( fn check_crate_whitelist<'a>(
whitelist: &'a HashSet<Crate>, whitelist: &'a HashSet<Crate<'_>>,
resolve: &'a Resolve, resolve: &'a Resolve,
visited: &'b mut BTreeSet<CrateVersion<'a>>, visited: &mut BTreeSet<CrateVersion<'a>>,
krate: CrateVersion<'a>, krate: CrateVersion<'a>,
must_be_on_whitelist: bool, must_be_on_whitelist: bool,
) -> BTreeSet<Crate<'a>> { ) -> BTreeSet<Crate<'a>> {

2
src/tools/tidy/src/features.rs
View file

@ -22,7 +22,7 @@ pub enum Status {
} }
impl fmt::Display for 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 { let as_str = match *self {
Status::Stable => "stable", Status::Stable => "stable",
Status::Unstable => "unstable", Status::Unstable => "unstable",

3
src/tools/tidy/src/lib.rs
View file

@ -3,7 +3,8 @@
//! This library contains the tidy lints and exposes it //! This library contains the tidy lints and exposes it
//! to be used by tools. //! to be used by tools.
extern crate serde; #![deny(rust_2018_idioms)]
extern crate serde_json; extern crate serde_json;
#[macro_use] #[macro_use]
extern crate serde_derive; extern crate serde_derive;