diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 443a9c7e9d9d..fad7ef4cee5f 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -51,8 +51,6 @@ use rustc::session::Session; use rustc_data_structures::fx::FxHashSet; use rustc_lint::LintId; -use std::path::Path; - /// Macro used to declare a Clippy lint. /// /// Every lint declaration consists of 4 parts: @@ -310,7 +308,7 @@ pub mod write; pub mod zero_div_zero; // end lints modules, do not remove this comment, it’s used in `update_lints` -pub use crate::utils::conf::Conf; +pub use crate::utils::config::Conf; mod reexport { crate use syntax::ast::Name; @@ -337,42 +335,41 @@ pub fn register_pre_expansion_lints(store: &mut rustc_lint::LintStore, conf: &Co #[doc(hidden)] pub fn read_conf(args: &[syntax::ast::NestedMetaItem], sess: &Session) -> Conf { - match utils::conf::file_from_args(args) { + use std::path::Path; + match utils::config::file_from_args(args) { Ok(file_name) => { // if the user specified a file, it must exist, otherwise default to `clippy.toml` but // do not require the file to exist - let file_name = if let Some(file_name) = file_name { - Some(file_name) - } else { - match utils::conf::lookup_conf_file() { - Ok(path) => path, + let file_name = match file_name { + Some(file_name) => file_name, + None => match utils::config::lookup_conf_file() { + Ok(Some(path)) => path, + Ok(None) => return Conf::default(), Err(error) => { sess.struct_err(&format!("error finding Clippy's configuration file: {}", error)) .emit(); - None + return Conf::default(); }, - } + }, }; - let file_name = file_name.map(|file_name| { - if file_name.is_relative() { - sess.local_crate_source_file - .as_deref() - .and_then(Path::parent) - .unwrap_or_else(|| Path::new("")) - .join(file_name) - } else { - file_name - } - }); + let file_name = if file_name.is_relative() { + sess.local_crate_source_file + .as_deref() + .and_then(Path::parent) + .unwrap_or_else(|| Path::new("")) + .join(file_name) + } else { + file_name + }; - let (conf, errors) = utils::conf::read(file_name.as_ref().map(AsRef::as_ref)); + let (conf, errors) = utils::config::read(&file_name); // all conf errors are non-fatal, we just use the default conf in case of error for error in errors { sess.struct_err(&format!( "error reading Clippy's configuration file `{}`: {}", - file_name.as_ref().and_then(|p| p.to_str()).unwrap_or(""), + file_name.display(), error )) .emit(); diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs deleted file mode 100644 index 2b7c6d8920c4..000000000000 --- a/clippy_lints/src/utils/conf.rs +++ /dev/null @@ -1,256 +0,0 @@ -//! Read configurations files. - -#![deny(clippy::missing_docs_in_private_items)] - -use lazy_static::lazy_static; -use rustc_span::source_map; -use std::default::Default; -use std::io::Read; -use std::sync::Mutex; -use std::{env, fmt, fs, io, path}; -use syntax::ast; - -/// Gets the configuration file from arguments. -pub fn file_from_args(args: &[ast::NestedMetaItem]) -> Result, (&'static str, source_map::Span)> { - for arg in args.iter().filter_map(syntax::ast::NestedMetaItem::meta_item) { - if arg.check_name(sym!(conf_file)) { - return match arg.kind { - ast::MetaItemKind::Word | ast::MetaItemKind::List(_) => { - Err(("`conf_file` must be a named value", arg.span)) - }, - ast::MetaItemKind::NameValue(ref value) => { - if let ast::LitKind::Str(ref file, _) = value.kind { - Ok(Some(file.to_string().into())) - } else { - Err(("`conf_file` value must be a string", value.span)) - } - }, - }; - } - } - - Ok(None) -} - -/// Error from reading a configuration file. -#[derive(Debug)] -pub enum Error { - /// An I/O error. - Io(io::Error), - /// Not valid toml or doesn't fit the expected conf format - Toml(String), -} - -impl fmt::Display for Error { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> { - match *self { - Self::Io(ref err) => err.fmt(f), - Self::Toml(ref err) => err.fmt(f), - } - } -} - -impl From for Error { - fn from(e: io::Error) -> Self { - Self::Io(e) - } -} - -lazy_static! { - static ref ERRORS: Mutex> = Mutex::new(Vec::new()); -} - -macro_rules! define_Conf { - ($(#[$doc: meta] ($rust_name: ident, $rust_name_str: expr, $default: expr => $($ty: tt)+),)+) => { - pub use self::helpers::Conf; - mod helpers { - use serde::Deserialize; - /// Type used to store lint configuration. - #[derive(Deserialize)] - #[serde(rename_all="kebab-case", deny_unknown_fields)] - pub struct Conf { - $(#[$doc] #[serde(default=$rust_name_str)] #[serde(with=$rust_name_str)] - pub $rust_name: define_Conf!(TY $($ty)+),)+ - #[allow(dead_code)] - #[serde(default)] - third_party: Option<::toml::Value>, - } - $( - mod $rust_name { - use serde::Deserialize; - crate fn deserialize<'de, D: serde::Deserializer<'de>>(deserializer: D) - -> Result { - type T = define_Conf!(TY $($ty)+); - Ok(T::deserialize(deserializer).unwrap_or_else(|e| { - crate::utils::conf::ERRORS.lock().expect("no threading here") - .push(crate::utils::conf::Error::Toml(e.to_string())); - super::$rust_name() - })) - } - } - - #[must_use] - fn $rust_name() -> define_Conf!(TY $($ty)+) { - define_Conf!(DEFAULT $($ty)+, $default) - } - )+ - } - }; - - // hack to convert tts - (TY $ty: ty) => { $ty }; - - // provide a nicer syntax to declare the default value of `Vec` variables - (DEFAULT Vec, $e: expr) => { $e.iter().map(|&e| e.to_owned()).collect() }; - (DEFAULT $ty: ty, $e: expr) => { $e }; -} - -define_Conf! { - /// Lint: BLACKLISTED_NAME. The list of blacklisted names to lint about - (blacklisted_names, "blacklisted_names", ["foo", "bar", "baz", "quux"] => Vec), - /// Lint: COGNITIVE_COMPLEXITY. The maximum cognitive complexity a function can have - (cognitive_complexity_threshold, "cognitive_complexity_threshold", 25 => u64), - /// DEPRECATED LINT: CYCLOMATIC_COMPLEXITY. Use the Cognitive Complexity lint instead. - (cyclomatic_complexity_threshold, "cyclomatic_complexity_threshold", None => Option), - /// Lint: DOC_MARKDOWN. The list of words this lint should not consider as identifiers needing ticks - (doc_valid_idents, "doc_valid_idents", [ - "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", - "DirectX", - "ECMAScript", - "GPLv2", "GPLv3", - "GitHub", "GitLab", - "IPv4", "IPv6", - "JavaScript", - "NaN", "NaNs", - "OAuth", - "OpenGL", "OpenSSH", "OpenSSL", "OpenStreetMap", - "TrueType", - "iOS", "macOS", - "TeX", "LaTeX", "BibTeX", "BibLaTeX", - "MinGW", - "CamelCase", - ] => Vec), - /// Lint: TOO_MANY_ARGUMENTS. The maximum number of argument a function or method can have - (too_many_arguments_threshold, "too_many_arguments_threshold", 7 => u64), - /// Lint: TYPE_COMPLEXITY. The maximum complexity a type can have - (type_complexity_threshold, "type_complexity_threshold", 250 => u64), - /// Lint: MANY_SINGLE_CHAR_NAMES. The maximum number of single char bindings a scope may have - (single_char_binding_names_threshold, "single_char_binding_names_threshold", 5 => u64), - /// Lint: BOXED_LOCAL. The maximum size of objects (in bytes) that will be linted. Larger objects are ok on the heap - (too_large_for_stack, "too_large_for_stack", 200 => u64), - /// Lint: ENUM_VARIANT_NAMES. The minimum number of enum variants for the lints about variant names to trigger - (enum_variant_name_threshold, "enum_variant_name_threshold", 3 => u64), - /// Lint: LARGE_ENUM_VARIANT. The maximum size of a enum's variant to avoid box suggestion - (enum_variant_size_threshold, "enum_variant_size_threshold", 200 => u64), - /// Lint: VERBOSE_BIT_MASK. The maximum allowed size of a bit mask before suggesting to use 'trailing_zeros' - (verbose_bit_mask_threshold, "verbose_bit_mask_threshold", 1 => u64), - /// Lint: DECIMAL_LITERAL_REPRESENTATION. The lower bound for linting decimal literals - (literal_representation_threshold, "literal_representation_threshold", 16384 => u64), - /// Lint: TRIVIALLY_COPY_PASS_BY_REF. The maximum size (in bytes) to consider a `Copy` type for passing by value instead of by reference. - (trivial_copy_size_limit, "trivial_copy_size_limit", None => Option), - /// Lint: TOO_MANY_LINES. The maximum number of lines a function or method can have - (too_many_lines_threshold, "too_many_lines_threshold", 100 => u64), - /// Lint: LARGE_STACK_ARRAYS. The maximum allowed size for arrays on the stack - (array_size_threshold, "array_size_threshold", 512_000 => u64), - /// Lint: VEC_BOX. The size of the boxed type in bytes, where boxing in a `Vec` is allowed - (vec_box_size_threshold, "vec_box_size_threshold", 4096 => u64), -} - -impl Default for Conf { - #[must_use] - fn default() -> Self { - toml::from_str("").expect("we never error on empty config files") - } -} - -/// Search for the configuration file. -pub fn lookup_conf_file() -> io::Result> { - /// Possible filename to search for. - const CONFIG_FILE_NAMES: [&str; 2] = [".clippy.toml", "clippy.toml"]; - - // Start looking for a config file in CLIPPY_CONF_DIR, or failing that, CARGO_MANIFEST_DIR. - // If neither of those exist, use ".". - let mut current = path::PathBuf::from( - env::var("CLIPPY_CONF_DIR") - .or_else(|_| env::var("CARGO_MANIFEST_DIR")) - .unwrap_or_else(|_| ".".to_string()), - ); - loop { - for config_file_name in &CONFIG_FILE_NAMES { - let config_file = current.join(config_file_name); - match fs::metadata(&config_file) { - // Only return if it's a file to handle the unlikely situation of a directory named - // `clippy.toml`. - Ok(ref md) if md.is_file() => return Ok(Some(config_file)), - // Return the error if it's something other than `NotFound`; otherwise we didn't - // find the project file yet, and continue searching. - Err(e) => { - if e.kind() != io::ErrorKind::NotFound { - return Err(e); - } - }, - _ => (), - } - } - - // If the current directory has no parent, we're done searching. - if !current.pop() { - return Ok(None); - } - } -} - -/// Produces a `Conf` filled with the default values and forwards the errors -/// -/// Used internally for convenience -fn default(errors: Vec) -> (Conf, Vec) { - (Conf::default(), errors) -} - -/// Read the `toml` configuration file. -/// -/// In case of error, the function tries to continue as much as possible. -pub fn read(path: Option<&path::Path>) -> (Conf, Vec) { - let path = if let Some(path) = path { - path - } else { - return default(Vec::new()); - }; - - let file = match fs::File::open(path) { - Ok(mut file) => { - let mut buf = String::new(); - - if let Err(err) = file.read_to_string(&mut buf) { - return default(vec![err.into()]); - } - - buf - }, - Err(err) => return default(vec![err.into()]), - }; - - assert!(ERRORS.lock().expect("no threading -> mutex always safe").is_empty()); - match toml::from_str(&file) { - Ok(toml) => { - let mut errors = ERRORS.lock().expect("no threading -> mutex always safe").split_off(0); - - let toml_ref: &Conf = &toml; - - let cyc_field: Option = toml_ref.cyclomatic_complexity_threshold; - - if cyc_field.is_some() { - let cyc_err = "found deprecated field `cyclomatic-complexity-threshold`. Please use `cognitive-complexity-threshold` instead.".to_string(); - errors.push(Error::Toml(cyc_err)); - } - - (toml, errors) - }, - Err(e) => { - let mut errors = ERRORS.lock().expect("no threading -> mutex always safe").split_off(0); - errors.push(Error::Toml(e.to_string())); - - default(errors) - }, - } -} diff --git a/clippy_lints/src/utils/config/helpers.rs b/clippy_lints/src/utils/config/helpers.rs new file mode 100644 index 000000000000..b05ed94ba647 --- /dev/null +++ b/clippy_lints/src/utils/config/helpers.rs @@ -0,0 +1,100 @@ +use serde::Deserialize; + +macro_rules! define_Conf { + ($(#[$doc:meta] ($config:ident, $config_str:literal: $Ty:ty, $default:expr),)+) => { + /// Type used to store lint configuration. + #[derive(Deserialize)] + #[serde(rename_all = "kebab-case", deny_unknown_fields)] + pub struct Conf { + $( + #[$doc] + #[serde(default = $config_str)] + #[serde(with = $config_str)] + pub $config: $Ty, + )+ + #[allow(dead_code)] + #[serde(default)] + third_party: Option<::toml::Value>, + } + + $( + mod $config { + use serde::Deserialize; + crate fn deserialize<'de, D: serde::Deserializer<'de>>(deserializer: D) -> Result<$Ty, D::Error> { + use super::super::{ERRORS, Error}; + Ok( + <$Ty>::deserialize(deserializer).unwrap_or_else(|e| { + ERRORS + .lock() + .expect("no threading here") + .push(Error::Toml(e.to_string())); + super::$config() + }) + ) + } + } + + #[must_use] + fn $config() -> $Ty { + let x = $default; + x + } + )+ + }; +} + +define_Conf! { + /// Lint: BLACKLISTED_NAME. The list of blacklisted names to lint about + (blacklisted_names, "blacklisted_names": Vec, ["foo", "bar", "baz", "quux"].iter().map(ToString::to_string).collect()), + /// Lint: COGNITIVE_COMPLEXITY. The maximum cognitive complexity a function can have + (cognitive_complexity_threshold, "cognitive_complexity_threshold": u64, 25), + /// DEPRECATED LINT: CYCLOMATIC_COMPLEXITY. Use the Cognitive Complexity lint instead. + (cyclomatic_complexity_threshold, "cyclomatic_complexity_threshold": Option, None), + /// Lint: DOC_MARKDOWN. The list of words this lint should not consider as identifiers needing ticks + (doc_valid_idents, "doc_valid_idents": Vec, [ + "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", + "DirectX", + "ECMAScript", + "GPLv2", "GPLv3", + "GitHub", "GitLab", + "IPv4", "IPv6", + "JavaScript", + "NaN", "NaNs", + "OAuth", + "OpenGL", "OpenSSH", "OpenSSL", "OpenStreetMap", + "TrueType", + "iOS", "macOS", + "TeX", "LaTeX", "BibTeX", "BibLaTeX", + "MinGW", + "CamelCase", + ].iter().map(ToString::to_string).collect()), + /// Lint: TOO_MANY_ARGUMENTS. The maximum number of argument a function or method can have + (too_many_arguments_threshold, "too_many_arguments_threshold": u64, 7), + /// Lint: TYPE_COMPLEXITY. The maximum complexity a type can have + (type_complexity_threshold, "type_complexity_threshold": u64, 250), + /// Lint: MANY_SINGLE_CHAR_NAMES. The maximum number of single char bindings a scope may have + (single_char_binding_names_threshold, "single_char_binding_names_threshold": u64, 5), + /// Lint: BOXED_LOCAL. The maximum size of objects (in bytes) that will be linted. Larger objects are ok on the heap + (too_large_for_stack, "too_large_for_stack": u64, 200), + /// Lint: ENUM_VARIANT_NAMES. The minimum number of enum variants for the lints about variant names to trigger + (enum_variant_name_threshold, "enum_variant_name_threshold": u64, 3), + /// Lint: LARGE_ENUM_VARIANT. The maximum size of a enum's variant to avoid box suggestion + (enum_variant_size_threshold, "enum_variant_size_threshold": u64, 200), + /// Lint: VERBOSE_BIT_MASK. The maximum allowed size of a bit mask before suggesting to use 'trailing_zeros' + (verbose_bit_mask_threshold, "verbose_bit_mask_threshold": u64, 1), + /// Lint: DECIMAL_LITERAL_REPRESENTATION. The lower bound for linting decimal literals + (literal_representation_threshold, "literal_representation_threshold": u64, 16384), + /// Lint: TRIVIALLY_COPY_PASS_BY_REF. The maximum size (in bytes) to consider a `Copy` type for passing by value instead of by reference. + (trivial_copy_size_limit, "trivial_copy_size_limit": Option, None), + /// Lint: TOO_MANY_LINES. The maximum number of lines a function or method can have + (too_many_lines_threshold, "too_many_lines_threshold": u64, 100), + /// Lint: LARGE_STACK_ARRAYS. The maximum allowed size for arrays on the stack + (array_size_threshold, "array_size_threshold": u64, 512_000), +} + +impl Default for Conf { + #[must_use] + fn default() -> Self { + toml::from_str("").expect("we never error on empty config files") + } +} diff --git a/clippy_lints/src/utils/config/mod.rs b/clippy_lints/src/utils/config/mod.rs new file mode 100644 index 000000000000..3b49b7d1cddd --- /dev/null +++ b/clippy_lints/src/utils/config/mod.rs @@ -0,0 +1,136 @@ +//! Read configurations files. + +#![deny(clippy::missing_docs_in_private_items)] + +mod helpers; + +use lazy_static::lazy_static; +use std::sync::Mutex; +use std::{env, fmt, fs, io, mem, path}; +use syntax::ast::{LitKind, MetaItemKind, NestedMetaItem}; +use syntax::source_map; + +pub use self::helpers::Conf; + +/// Gets the configuration file from arguments. +pub fn file_from_args(args: &[NestedMetaItem]) -> Result, (&'static str, source_map::Span)> { + for arg in args.iter().filter_map(NestedMetaItem::meta_item) { + if arg.check_name(sym!(conf_file)) { + return match arg.kind { + MetaItemKind::Word | MetaItemKind::List(_) => Err(("`conf_file` must be a named value", arg.span)), + MetaItemKind::NameValue(ref value) => { + if let LitKind::Str(ref file, _) = value.kind { + Ok(Some(file.to_string().into())) + } else { + Err(("`conf_file` value must be a string", value.span)) + } + }, + }; + } + } + + Ok(None) +} + +/// Error from reading a configuration file. +#[derive(Debug)] +pub enum Error { + /// An I/O error. + Io(io::Error), + /// Not valid toml or doesn't fit the expected conf format + Toml(String), +} + +impl fmt::Display for Error { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match *self { + Self::Io(ref err) => err.fmt(f), + Self::Toml(ref err) => err.fmt(f), + } + } +} + +impl From for Error { + fn from(e: io::Error) -> Self { + Self::Io(e) + } +} + +lazy_static! { + static ref ERRORS: Mutex> = Mutex::new(Vec::new()); +} + +/// Search for the configuration file. +pub fn lookup_conf_file() -> io::Result> { + /// Possible filename to search for. + const CONFIG_FILE_NAMES: [&str; 2] = [".clippy.toml", "clippy.toml"]; + + // Start looking for a config file in CLIPPY_CONF_DIR, or failing that, CARGO_MANIFEST_DIR. + // If neither of those exist, use ".". + let mut current = path::PathBuf::from( + env::var("CLIPPY_CONF_DIR") + .or_else(|_| env::var("CARGO_MANIFEST_DIR")) + .unwrap_or_else(|_| ".".to_string()), + ); + loop { + for config_file_name in &CONFIG_FILE_NAMES { + let config_file = current.join(config_file_name); + match fs::metadata(&config_file) { + // Only return if it's a file to handle the unlikely situation of a directory named + // `clippy.toml`. + Ok(ref md) if md.is_file() => return Ok(Some(config_file)), + // Return the error if it's something other than `NotFound`; otherwise we didn't + // find the project file yet, and continue searching. + Err(e) if e.kind() != io::ErrorKind::NotFound => return Err(e), + _ => {}, + } + } + + // If the current directory has no parent, we're done searching. + if !current.pop() { + return Ok(None); + } + } +} + +/// Produces a `Conf` filled with the default values and forwards the errors +/// +/// Used internally for convenience +fn default(errors: Vec) -> (Conf, Vec) { + (Conf::default(), errors) +} + +/// Read the `toml` configuration file. +/// +/// In case of error, the function tries to continue as much as possible. +pub fn read(path: &path::Path) -> (Conf, Vec) { + let content = match fs::read_to_string(path) { + Ok(content) => content, + Err(err) => return default(vec![err.into()]), + }; + + let mut errors = ERRORS.lock().expect("no threading -> mutex always safe"); + assert!(errors.is_empty()); + + let mut errors = mem::take(&mut *errors); + + match toml::from_str(&content) { + Ok(toml) => { + let toml_ref: &Conf = &toml; + + let cyc_field: Option = toml_ref.cyclomatic_complexity_threshold; + + if cyc_field.is_some() { + let cyc_err = "found deprecated field `cyclomatic-complexity-threshold`. Please use `cognitive-complexity-threshold` instead.".to_string(); + errors.push(Error::Toml(cyc_err)); + } + + (toml, errors) + }, + Err(e) => { + errors.push(Error::Toml(e.to_string())); + + default(errors) + }, + } +} diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index d1849a7c3141..c94a68c24d90 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -5,7 +5,7 @@ pub mod attrs; pub mod author; pub mod camel_case; pub mod comparisons; -pub mod conf; +pub mod config; pub mod constants; mod diagnostics; pub mod higher;