user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use symbols instead of strings

Browse source
This commit is contained in:
Oliver Scherer 2019-05-14 01:34:08 +02:00
parent 42480fd031
commit b2dbda4d48
82 changed files with 1206 additions and 700 deletions
Download patch file Download diff file Expand all files Collapse all files

7
clippy_lints/src/unwrap.rs
View file

@ -5,6 +5,7 @@ use rustc::{declare_lint_pass, declare_tool_lint};
use crate::utils::{
higher::if_block, in_macro_or_desugar, match_type, paths, span_lint_and_then, usage::is_potentially_mutated,
};
use crate::utils::sym;
use rustc::hir::intravisit::*;
use rustc::hir::*;
use syntax::source_map::Span;
@ -95,7 +96,7 @@ fn collect_unwrap_info<'a, 'tcx: 'a>(
if let ExprKind::MethodCall(method_name, _, args) = &expr.node;
if let ExprKind::Path(QPath::Resolved(None, path)) = &args[0].node;
let ty = cx.tables.expr_ty(&args[0]);
if match_type(cx, ty, &paths::OPTION) || match_type(cx, ty, &paths::RESULT);
if match_type(cx, ty, &*paths::OPTION) || match_type(cx, ty, &*paths::RESULT);
let name = method_name.ident.as_str();
if ["is_some", "is_none", "is_ok", "is_err"].contains(&&*name);
then {
@ -143,8 +144,8 @@ impl<'a, 'tcx: 'a> Visitor<'tcx> for UnwrappableVariablesVisitor<'a, 'tcx> {
if_chain! {
if let ExprKind::MethodCall(ref method_name, _, ref args) = expr.node;
if let ExprKind::Path(QPath::Resolved(None, ref path)) = args[0].node;
if ["unwrap", "unwrap_err"].contains(&&*method_name.ident.as_str());
let call_to_unwrap = method_name.ident.name == "unwrap";
if [*sym::unwrap, *sym::unwrap_err].contains(&method_name.ident.name);
let call_to_unwrap = method_name.ident.name == *sym::unwrap;
if let Some(unwrappable) = self.unwrappables.iter()
.find(|u| u.ident.res == path.res);
then {