Refactor: Use rustc's match_def_path

This replaces our match_def_path implementation with the rustc one.

Note that we can't just use it in all call sites because of the
`&[&str]` / `&[Symbol]` difference in Clippy/rustc.
This commit is contained in:
Philipp Hansch 2020-04-12 10:41:25 +02:00
parent 97aa8dc778
commit 9ec95af702
No known key found for this signature in database
GPG key ID: 2B4399C4BF4DCBDE

View file

@ -1222,8 +1222,10 @@ pub fn is_normalizable<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, param_env: ty::Para
} }
pub fn match_def_path<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, did: DefId, syms: &[&str]) -> bool { pub fn match_def_path<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, did: DefId, syms: &[&str]) -> bool {
let path = cx.get_def_path(did); // We have to convert `syms` to `&[Symbol]` here because rustc's `match_def_path`
path.len() == syms.len() && path.into_iter().zip(syms.iter()).all(|(a, &b)| a.as_str() == b) // accepts only that. We should probably move to Symbols in Clippy as well.
let syms = syms.iter().map(|p| Symbol::intern(p)).collect::<Vec<Symbol>>();
cx.match_def_path(did, &syms)
} }
/// Returns the list of condition expressions and the list of blocks in a /// Returns the list of condition expressions and the list of blocks in a