d647696c1f
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`... And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun... Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work. ```nu mv v0.0.212 rust-1.00.0; mv beta rust-1.57.0; mv master rust-1.58.0; let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path); let versions = ( ls | where name =~ "rust-" | select name | format {name}/lints.json | each { open $it | select id | insert version $it | str substring "5,11" version} | group-by id | rotate counter-clockwise id version | update version {get version | first 1} | flatten | select id version); $paths | each { |row| let version = ($versions | where id == ($row.id) | format {version}) let idu = ($row.id | str upcase) $"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)" } | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh"; ``` And this still has some problems, but at this point I just want to be done -.-
148 lines
5.5 KiB
Rust
148 lines
5.5 KiB
Rust
use clippy_utils::diagnostics::span_lint_and_help;
|
|
use rustc_hir::{CaptureBy, Expr, ExprKind, PatKind};
|
|
use rustc_lint::{LateContext, LateLintPass};
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
|
|
|
declare_clippy_lint! {
|
|
/// ### What it does
|
|
/// Checks for instances of `map_err(|_| Some::Enum)`
|
|
///
|
|
/// ### Why is this bad?
|
|
/// This `map_err` throws away the original error rather than allowing the enum to contain and report the cause of the error
|
|
///
|
|
/// ### Example
|
|
/// Before:
|
|
/// ```rust
|
|
/// use std::fmt;
|
|
///
|
|
/// #[derive(Debug)]
|
|
/// enum Error {
|
|
/// Indivisible,
|
|
/// Remainder(u8),
|
|
/// }
|
|
///
|
|
/// impl fmt::Display for Error {
|
|
/// fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
/// match self {
|
|
/// Error::Indivisible => write!(f, "could not divide input by three"),
|
|
/// Error::Remainder(remainder) => write!(
|
|
/// f,
|
|
/// "input is not divisible by three, remainder = {}",
|
|
/// remainder
|
|
/// ),
|
|
/// }
|
|
/// }
|
|
/// }
|
|
///
|
|
/// impl std::error::Error for Error {}
|
|
///
|
|
/// fn divisible_by_3(input: &str) -> Result<(), Error> {
|
|
/// input
|
|
/// .parse::<i32>()
|
|
/// .map_err(|_| Error::Indivisible)
|
|
/// .map(|v| v % 3)
|
|
/// .and_then(|remainder| {
|
|
/// if remainder == 0 {
|
|
/// Ok(())
|
|
/// } else {
|
|
/// Err(Error::Remainder(remainder as u8))
|
|
/// }
|
|
/// })
|
|
/// }
|
|
/// ```
|
|
///
|
|
/// After:
|
|
/// ```rust
|
|
/// use std::{fmt, num::ParseIntError};
|
|
///
|
|
/// #[derive(Debug)]
|
|
/// enum Error {
|
|
/// Indivisible(ParseIntError),
|
|
/// Remainder(u8),
|
|
/// }
|
|
///
|
|
/// impl fmt::Display for Error {
|
|
/// fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
/// match self {
|
|
/// Error::Indivisible(_) => write!(f, "could not divide input by three"),
|
|
/// Error::Remainder(remainder) => write!(
|
|
/// f,
|
|
/// "input is not divisible by three, remainder = {}",
|
|
/// remainder
|
|
/// ),
|
|
/// }
|
|
/// }
|
|
/// }
|
|
///
|
|
/// impl std::error::Error for Error {
|
|
/// fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
|
|
/// match self {
|
|
/// Error::Indivisible(source) => Some(source),
|
|
/// _ => None,
|
|
/// }
|
|
/// }
|
|
/// }
|
|
///
|
|
/// fn divisible_by_3(input: &str) -> Result<(), Error> {
|
|
/// input
|
|
/// .parse::<i32>()
|
|
/// .map_err(Error::Indivisible)
|
|
/// .map(|v| v % 3)
|
|
/// .and_then(|remainder| {
|
|
/// if remainder == 0 {
|
|
/// Ok(())
|
|
/// } else {
|
|
/// Err(Error::Remainder(remainder as u8))
|
|
/// }
|
|
/// })
|
|
/// }
|
|
/// ```
|
|
#[clippy::version = "1.48.0"]
|
|
pub MAP_ERR_IGNORE,
|
|
restriction,
|
|
"`map_err` should not ignore the original error"
|
|
}
|
|
|
|
declare_lint_pass!(MapErrIgnore => [MAP_ERR_IGNORE]);
|
|
|
|
impl<'tcx> LateLintPass<'tcx> for MapErrIgnore {
|
|
// do not try to lint if this is from a macro or desugaring
|
|
fn check_expr(&mut self, cx: &LateContext<'_>, e: &Expr<'_>) {
|
|
if e.span.from_expansion() {
|
|
return;
|
|
}
|
|
|
|
// check if this is a method call (e.g. x.foo())
|
|
if let ExprKind::MethodCall(method, _t_span, args, _) = e.kind {
|
|
// only work if the method name is `map_err` and there are only 2 arguments (e.g. x.map_err(|_|[1]
|
|
// Enum::Variant[2]))
|
|
if method.ident.as_str() == "map_err" && args.len() == 2 {
|
|
// make sure the first argument is a closure, and grab the CaptureRef, body_id, and body_span fields
|
|
if let ExprKind::Closure(capture, _, body_id, body_span, _) = args[1].kind {
|
|
// check if this is by Reference (meaning there's no move statement)
|
|
if capture == CaptureBy::Ref {
|
|
// Get the closure body to check the parameters and values
|
|
let closure_body = cx.tcx.hir().body(body_id);
|
|
// make sure there's only one parameter (`|_|`)
|
|
if closure_body.params.len() == 1 {
|
|
// make sure that parameter is the wild token (`_`)
|
|
if let PatKind::Wild = closure_body.params[0].pat.kind {
|
|
// span the area of the closure capture and warn that the
|
|
// original error will be thrown away
|
|
span_lint_and_help(
|
|
cx,
|
|
MAP_ERR_IGNORE,
|
|
body_span,
|
|
"`map_err(|_|...` wildcard pattern discards the original error",
|
|
None,
|
|
"consider storing the original error as a source in the new error, or silence this warning using an ignored identifier (`.map_err(|_foo| ...`)",
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|