Skip to content

Commit f4bf393

Browse files
committed
Fix some nightly clippy warnings
1 parent ca1f1dd commit f4bf393

File tree

9 files changed

+14
-19
lines changed

9 files changed

+14
-19
lines changed

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ fn write_known_targets(out_dir: &Path) -> Result<()> {
162162
use std::io::BufRead;
163163

164164
let targets: Vec<String> = std::process::Command::new("rustc")
165-
.args(&["--print", "target-list"])
165+
.args(["--print", "target-list"])
166166
.output()?
167167
.stdout
168168
.lines()

src/index/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl Index {
109109
let gc = Command::new("git")
110110
.arg("-C")
111111
.arg(&self.path)
112-
.args(&["gc", "--auto"])
112+
.args(["gc", "--auto"])
113113
.output()
114114
.with_context(|| format!("failed to run `git gc --auto`\npath: {:#?}", &self.path));
115115

src/storage/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ impl Storage {
302302

303303
Ok(Blob {
304304
path: format!("{}/{}", archive_path, path),
305-
mime: detect_mime(&path).into(),
305+
mime: detect_mime(path).into(),
306306
date_updated: blob.date_updated,
307307
content: blob.content,
308308
compression: None,

src/web/crate_details.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ pub fn crate_details_handler(req: &mut Request) -> IronResult<Response> {
303303
let name = cexpect!(req, router.find("name"));
304304
let req_version = router.find("version");
305305

306-
if req_version == None {
306+
if req_version.is_none() {
307307
let url = ctry!(
308308
req,
309309
Url::parse(&format!("{}/crate/{}/latest", redirect_base(req), name,)),

src/web/csp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl Csp {
1515
getrandom::getrandom(&mut random).expect("failed to generate a nonce");
1616

1717
Self {
18-
nonce: base64::encode(&random),
18+
nonce: base64::encode(random),
1919
suppress: false,
2020
}
2121
}

src/web/features.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@ pub fn build_features_handler(req: &mut Request) -> IronResult<Response> {
8585
fn order_features_and_count_default_len(raw: Vec<Feature>) -> (Vec<Feature>, usize) {
8686
let mut feature_map = get_feature_map(raw);
8787
let mut features = get_tree_structure_from_default(&mut feature_map);
88-
let mut remaining: Vec<_> = feature_map
89-
.into_iter()
90-
.map(|(_, feature)| feature)
91-
.collect();
88+
let mut remaining = Vec::from_iter(feature_map.into_values());
9289
remaining.sort_by_key(|feature| feature.subfeatures.len());
9390

9491
let default_len = features.len();

src/web/releases.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ pub fn search_handler(req: &mut Request) -> IronResult<Response> {
535535
let search_result = ctry!(
536536
req,
537537
if let Some(paginate) = params.get("paginate") {
538-
let decoded = base64::decode(&paginate.as_bytes()).map_err(|e| -> IronError {
538+
let decoded = base64::decode(paginate.as_bytes()).map_err(|e| -> IronError {
539539
warn!(
540540
"error when decoding pagination base64 string \"{}\": {:?}",
541541
paginate, e
@@ -571,9 +571,7 @@ pub fn search_handler(req: &mut Request) -> IronResult<Response> {
571571
}
572572
);
573573

574-
let executed_query = search_result
575-
.executed_query
576-
.unwrap_or_else(|| "".to_string());
574+
let executed_query = search_result.executed_query.unwrap_or_default();
577575

578576
let title = if search_result.results.is_empty() {
579577
format!("No results found for '{}'", executed_query)

src/web/rustdoc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
154154
}
155155
let (mut version, id) = v.version.into_parts();
156156

157-
if req_version == None || req_version == Some("latest") {
157+
if let None | Some("latest") = req_version {
158158
version = "latest".to_string()
159159
}
160160

src/web/source.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ impl FileList {
9898
}
9999

100100
// look only files for req_path
101-
if path.starts_with(&req_path) {
101+
if path.starts_with(req_path) {
102102
// remove req_path from path to reach files in this directory
103-
let path = path.replace(&req_path, "");
103+
let path = path.replace(req_path, "");
104104
let path_splited: Vec<&str> = path.split('/').collect();
105105

106106
// if path have '/' it is a directory
@@ -245,10 +245,10 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
245245
conn.query(
246246
"
247247
SELECT archive_storage
248-
FROM releases
248+
FROM releases
249249
INNER JOIN crates ON releases.crate_id = crates.id
250-
WHERE
251-
name = $1 AND
250+
WHERE
251+
name = $1 AND
252252
version = $2
253253
",
254254
&[&crate_name, &version]

0 commit comments

Comments
 (0)