Thanks to visit codestin.com
Credit goes to github.com

Skip to content

tidy: Cleanups and clippy warning fixes #53895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Sep 7, 2018
Merged

tidy: Cleanups and clippy warning fixes #53895

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cd51523
tidy: Use chars for single-character patterns
joshtriplett Sep 1, 2018
0f40a12
tidy: Use is_empty() instead of len tests
joshtriplett Sep 1, 2018
2893a21
tidy: Clean up argument handling
joshtriplett Sep 1, 2018
fb317aa
tidy: cargo.rs: Clean up loop to use "for" instead of "while let"
joshtriplett Sep 1, 2018
896c3ce
tidy: extdeps.rs: Clean up loop iteration to use "for"
joshtriplett Sep 1, 2018
decc3b0
tidy: extdeps.rs: Avoid an unnecessary collect()
joshtriplett Sep 1, 2018
cd20cdf
tidy: Use "const" instead of "static, and remove implied `'static` li…
joshtriplett Sep 1, 2018
226d79c
tidy: Avoid "let ref mut = ..."
joshtriplett Sep 1, 2018
40ea999
tidy: unstable_book.rs: Clean up directory iteration
joshtriplett Sep 2, 2018
fc3419c
tidy: deps: Hoist a complex multi-line if condition into a let
joshtriplett Sep 2, 2018
d5b1dee
tidy: Eliminate an unnecessary .into_iter()
joshtriplett Sep 2, 2018
87658bb
tidy: Use an inclusive range rather than a +1 bound
joshtriplett Sep 2, 2018
0e65aeb
tidy: features.rs: collect_lib_features: Simplify
joshtriplett Sep 2, 2018
ebdc1bd
tidy: features.rs: Use splitn rather than a complex slice
joshtriplett Sep 2, 2018
a5c86fe
tidy: features.rs: Remove a redundant .contains
joshtriplett Sep 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tidy: Use "const" instead of "static, and remove implied 'static li… 
…fetimes

Dropping the redundant lifetimes also eliminates a clippy warning.
  • Loading branch information
@joshtriplett
joshtriplett committed Sep 2, 2018
commit cd20cdf7e07d87cd346f6b71d0a46311b79218ab
8 changes: 4 additions & 4 deletions src/tools/tidy/src/deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::process::Command;

use serde_json;

static LICENSES: &'static [&'static str] = &[
const LICENSES: &[&str] = &[
"MIT/Apache-2.0",
"MIT / Apache-2.0",
"Apache-2.0/MIT",
Expand All @@ -33,7 +33,7 @@ static LICENSES: &'static [&'static str] = &[
/// should be considered bugs. Exceptions are only allowed in Rust
/// tooling. It is _crucial_ that no exception crates be dependencies
/// of the Rust runtime (std / test).
static EXCEPTIONS: &'static [&'static str] = &[
const EXCEPTIONS: &[&str] = &[
"mdbook", // MPL2, mdbook
"openssl", // BSD+advertising clause, cargo, mdbook
"pest", // MPL2, mdbook via handlebars
Expand All @@ -54,13 +54,13 @@ static EXCEPTIONS: &'static [&'static str] = &[
];

/// Which crates to check against the whitelist?
static WHITELIST_CRATES: &'static [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.
static WHITELIST: &'static [Crate] = &[
const WHITELIST: &[Crate] = &[
Crate("aho-corasick"),
Crate("arrayvec"),
Crate("atty"),
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/extdeps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use std::io::Read;
use std::path::Path;

/// List of whitelisted sources for packages
static WHITELISTED_SOURCES: &'static [&'static str] = &[
const WHITELISTED_SOURCES: &[&str] = &[
"\"registry+https://github.com/rust-lang/crates.io-index\"",
];

Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/pal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use std::path::Path;
use std::iter::Iterator;

// Paths that may contain platform-specific code
const EXCEPTION_PATHS: &'static [&'static str] = &[
const EXCEPTION_PATHS: &[&str] = &[
// std crates
"src/liballoc_jemalloc",
"src/liballoc_system",
Expand Down