about summary refs log tree commit diff
path: root/clippy_lints/src/utils/conf.rs
diff options
context:
space:
mode:
authormcarton <cartonmartin+git@gmail.com>2016-08-28 17:54:32 +0200
committermcarton <cartonmartin+git@gmail.com>2016-08-31 18:22:35 +0200
commit3f43996aa5b9163195039b45fa74a3c4635a90cd (patch)
treef64cd0a43da06a69f0709a23dfeb34bf17f42d01 /clippy_lints/src/utils/conf.rs
parentb38a86a145b510663e8b57f0a6df64f3c969cf1f (diff)
downloadrust-3f43996aa5b9163195039b45fa74a3c4635a90cd.tar.gz
rust-3f43996aa5b9163195039b45fa74a3c4635a90cd.zip
Rustup to *1.13.0-nightly (eac41469d 2016-08-30)*
Diffstat (limited to 'clippy_lints/src/utils/conf.rs')
-rw-r--r--clippy_lints/src/utils/conf.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs
index 748d144daa0..f9a93ed3f6e 100644
--- a/clippy_lints/src/utils/conf.rs
+++ b/clippy_lints/src/utils/conf.rs
@@ -4,13 +4,13 @@
 
 use std::{fmt, fs, io};
 use std::io::Read;
-use syntax::{ast, codemap, ptr};
+use syntax::{ast, codemap};
 use syntax::parse::token;
 use toml;
 
 /// Get the configuration file from arguments.
-pub fn file(args: &[ptr::P<ast::MetaItem>]) -> Result<Option<token::InternedString>, (&'static str, codemap::Span)> {
-    for arg in args {
+pub fn file(args: &[codemap::Spanned<ast::NestedMetaItemKind>]) -> Result<Option<token::InternedString>, (&'static str, codemap::Span)> {
+    for arg in args.iter().filter_map(|a| a.meta_item()) {
         match arg.node {
             ast::MetaItemKind::Word(ref name) |
             ast::MetaItemKind::List(ref name, _) => {