mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into unneeded_wildcard_pattern

Browse Source
This commit is contained in:
Michael Wright 2019-09-23 05:26:47 +02:00
commit ca6d36ba22
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clippy_lints/src/cargo_common_metadata.rs
View File

@ -1,5 +1,7 @@
//! lint on missing cargo common metadata
use std::path::PathBuf;
use crate::utils::span_lint;
use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
use rustc::{declare_lint_pass, declare_tool_lint};
@ -47,6 +49,10 @@ fn is_empty_str(value: &Option<String>) -> bool {
value.as_ref().map_or(true, String::is_empty)
}
fn is_empty_path(value: &Option<PathBuf>) -> bool {
value.as_ref().and_then(|x| x.to_str()).map_or(true, str::is_empty)
}
fn is_empty_vec(value: &[String]) -> bool {
// This works because empty iterators return true
value.iter().all(std::string::String::is_empty)
@ -72,8 +78,8 @@ fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &Crate) {
missing_warning(cx, &package, "package.description");
}
if is_empty_str(&package.license) {
missing_warning(cx, &package, "package.license");
if is_empty_str(&package.license) && is_empty_path(&package.license_file) {
missing_warning(cx, &package, "either package.license or package.license_file");
}
if is_empty_str(&package.repository) {

2
tests/ui/builtin-type-shadow.stderr
View File

@ -16,6 +16,8 @@ LL | 42
|
= note: expected type `u32`
found type `{integer}`
= help: type parameters must be constrained to match other types
= note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
error: aborting due to 2 previous errors