OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3213 from mikerite/fix-3204

Browse Source 
Fix single_char_pattern crash (#3204)
This commit is contained in:
mikerite 2018-09-24 09:11:32 +02:00 committed by GitHub
commit 417cf206ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clippy_lints/src/methods.rs
View File

@ -16,7 +16,6 @@ use crate::utils::{get_arg_name, get_trait_def_id, implements_trait, in_macro, i
span_lint, span_lint_and_sugg, span_lint_and_then, span_note_and_lint, walk_ptrs_ty, walk_ptrs_ty_depth, SpanlessEq};
use crate::utils::paths;
use crate::utils::sugg;
use crate::consts::{constant, Constant};
use crate::rustc_errors::Applicability;
#[derive(Clone)]
@ -1914,8 +1913,11 @@ fn lint_chars_last_cmp_with_unwrap<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, info: &
/// lint for length-1 `str`s for methods in `PATTERN_METHODS`
fn lint_single_char_pattern<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, _expr: &'tcx hir::Expr, arg: &'tcx hir::Expr) {
if let Some((Constant::Str(r), _)) = constant(cx, cx.tables, arg) {
if r.len() == 1 {
if_chain! {
if let hir::ExprKind::Lit(lit) = &arg.node;
if let ast::LitKind::Str(r, _) = lit.node;
if r.as_str().len() == 1;
then {
let snip = snippet(cx, arg.span, "..");
let hint = format!("'{}'", &snip[1..snip.len() - 1]);
span_lint_and_sugg(

4
tests/ui/single_char_pattern.rs
View File

@ -45,4 +45,8 @@ fn main() {
x.replace(";", ",").split(","); // issue #2978
x.starts_with("\x03"); // issue #2996
// Issue #3204
const S: &str = "#";
x.find(S);
}