-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into unnecessary_wrap
- Loading branch information
Showing
36 changed files
with
1,166 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| use std::fmt; | ||
|
|
||
| use crate::utils::span_lint_and_help; | ||
| use rustc_ast::ast::{Expr, ExprKind, InlineAsmOptions}; | ||
| use rustc_lint::{EarlyContext, EarlyLintPass, Lint}; | ||
| use rustc_session::{declare_lint_pass, declare_tool_lint}; | ||
|
|
||
| #[derive(Clone, Copy, PartialEq, Eq)] | ||
| enum AsmStyle { | ||
| Intel, | ||
| Att, | ||
| } | ||
|
|
||
| impl fmt::Display for AsmStyle { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| match self { | ||
| AsmStyle::Intel => f.write_str("Intel"), | ||
| AsmStyle::Att => f.write_str("AT&T"), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl std::ops::Not for AsmStyle { | ||
| type Output = AsmStyle; | ||
|
|
||
| fn not(self) -> AsmStyle { | ||
| match self { | ||
| AsmStyle::Intel => AsmStyle::Att, | ||
| AsmStyle::Att => AsmStyle::Intel, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn check_expr_asm_syntax(lint: &'static Lint, cx: &EarlyContext<'_>, expr: &Expr, check_for: AsmStyle) { | ||
| if let ExprKind::InlineAsm(ref inline_asm) = expr.kind { | ||
| let style = if inline_asm.options.contains(InlineAsmOptions::ATT_SYNTAX) { | ||
| AsmStyle::Att | ||
| } else { | ||
| AsmStyle::Intel | ||
| }; | ||
|
|
||
| if style == check_for { | ||
| span_lint_and_help( | ||
| cx, | ||
| lint, | ||
| expr.span, | ||
| &format!("{} x86 assembly syntax used", style), | ||
| None, | ||
| &format!("use {} x86 assembly syntax", !style), | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| declare_clippy_lint! { | ||
| /// **What it does:** Checks for usage of Intel x86 assembly syntax. | ||
| /// | ||
| /// **Why is this bad?** The lint has been enabled to indicate a preference | ||
| /// for AT&T x86 assembly syntax. | ||
| /// | ||
| /// **Known problems:** None. | ||
| /// | ||
| /// **Example:** | ||
| /// | ||
| /// ```rust,no_run | ||
| /// # #![feature(asm)] | ||
| /// # unsafe { let ptr = "".as_ptr(); | ||
| /// asm!("lea {}, [{}]", lateout(reg) _, in(reg) ptr); | ||
| /// # } | ||
| /// ``` | ||
| /// Use instead: | ||
| /// ```rust,no_run | ||
| /// # #![feature(asm)] | ||
| /// # unsafe { let ptr = "".as_ptr(); | ||
| /// asm!("lea ({}), {}", in(reg) ptr, lateout(reg) _, options(att_syntax)); | ||
| /// # } | ||
| /// ``` | ||
| pub INLINE_ASM_X86_INTEL_SYNTAX, | ||
| restriction, | ||
| "prefer AT&T x86 assembly syntax" | ||
| } | ||
|
|
||
| declare_lint_pass!(InlineAsmX86IntelSyntax => [INLINE_ASM_X86_INTEL_SYNTAX]); | ||
|
|
||
| impl EarlyLintPass for InlineAsmX86IntelSyntax { | ||
| fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) { | ||
| check_expr_asm_syntax(Self::get_lints()[0], cx, expr, AsmStyle::Intel); | ||
| } | ||
| } | ||
|
|
||
| declare_clippy_lint! { | ||
| /// **What it does:** Checks for usage of AT&T x86 assembly syntax. | ||
| /// | ||
| /// **Why is this bad?** The lint has been enabled to indicate a preference | ||
| /// for Intel x86 assembly syntax. | ||
| /// | ||
| /// **Known problems:** None. | ||
| /// | ||
| /// **Example:** | ||
| /// | ||
| /// ```rust,no_run | ||
| /// # #![feature(asm)] | ||
| /// # unsafe { let ptr = "".as_ptr(); | ||
| /// asm!("lea ({}), {}", in(reg) ptr, lateout(reg) _, options(att_syntax)); | ||
| /// # } | ||
| /// ``` | ||
| /// Use instead: | ||
| /// ```rust,no_run | ||
| /// # #![feature(asm)] | ||
| /// # unsafe { let ptr = "".as_ptr(); | ||
| /// asm!("lea {}, [{}]", lateout(reg) _, in(reg) ptr); | ||
| /// # } | ||
| /// ``` | ||
| pub INLINE_ASM_X86_ATT_SYNTAX, | ||
| restriction, | ||
| "prefer Intel x86 assembly syntax" | ||
| } | ||
|
|
||
| declare_lint_pass!(InlineAsmX86AttSyntax => [INLINE_ASM_X86_ATT_SYNTAX]); | ||
|
|
||
| impl EarlyLintPass for InlineAsmX86AttSyntax { | ||
| fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) { | ||
| check_expr_asm_syntax(Self::get_lints()[0], cx, expr, AsmStyle::Att); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| use crate::utils::span_lint; | ||
|
|
||
| use rustc_data_structures::fx::FxHashSet; | ||
| use rustc_hir::{Expr, ExprKind}; | ||
| use rustc_lint::{LateContext, LateLintPass}; | ||
| use rustc_session::{declare_tool_lint, impl_lint_pass}; | ||
| use rustc_span::Symbol; | ||
|
|
||
| declare_clippy_lint! { | ||
| /// **What it does:** Lints for specific trait methods defined in clippy.toml | ||
| /// | ||
| /// **Why is this bad?** Some methods are undesirable in certain contexts, | ||
| /// and it would be beneficial to lint for them as needed. | ||
| /// | ||
| /// **Known problems:** None. | ||
| /// | ||
| /// **Example:** | ||
| /// | ||
| /// ```rust,ignore | ||
| /// // example code where clippy issues a warning | ||
| /// foo.bad_method(); // Foo::bad_method is disallowed in the configuration | ||
| /// ``` | ||
| /// Use instead: | ||
| /// ```rust,ignore | ||
| /// // example code which does not raise clippy warning | ||
| /// goodStruct.bad_method(); // GoodStruct::bad_method is not disallowed | ||
| /// ``` | ||
| pub DISALLOWED_METHOD, | ||
| nursery, | ||
| "use of a disallowed method call" | ||
| } | ||
|
|
||
| #[derive(Clone, Debug)] | ||
| pub struct DisallowedMethod { | ||
| disallowed: FxHashSet<Vec<Symbol>>, | ||
| } | ||
|
|
||
| impl DisallowedMethod { | ||
| pub fn new(disallowed: &FxHashSet<String>) -> Self { | ||
| Self { | ||
| disallowed: disallowed | ||
| .iter() | ||
| .map(|s| s.split("::").map(|seg| Symbol::intern(seg)).collect::<Vec<_>>()) | ||
| .collect(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl_lint_pass!(DisallowedMethod => [DISALLOWED_METHOD]); | ||
|
|
||
| impl<'tcx> LateLintPass<'tcx> for DisallowedMethod { | ||
| fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) { | ||
| if let ExprKind::MethodCall(_path, _, _args, _) = &expr.kind { | ||
| let def_id = cx.typeck_results().type_dependent_def_id(expr.hir_id).unwrap(); | ||
|
|
||
| let method_call = cx.get_def_path(def_id); | ||
| if self.disallowed.contains(&method_call) { | ||
| let method = method_call | ||
| .iter() | ||
| .map(|s| s.to_ident_string()) | ||
| .collect::<Vec<_>>() | ||
| .join("::"); | ||
|
|
||
| span_lint( | ||
| cx, | ||
| DISALLOWED_METHOD, | ||
| expr.span, | ||
| &format!("use of a disallowed method `{}`", method), | ||
| ); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.