From 426a3ee1e7a9832d9f3cd1ac0aba0bcf5a3caa0d Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 2 Mar 2015 16:13:44 +0530 Subject: [PATCH] Rustup --- examples/box_vec.rs | 3 +-- examples/dlist.rs | 9 ++++----- examples/match_if_let.rs | 5 ++--- examples/toplevel_ref_arg.rs | 3 +-- src/lib.rs | 2 +- src/types.rs | 22 +++++++++++----------- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/examples/box_vec.rs b/examples/box_vec.rs index 874b9e8663c7..a93b53270bdf 100644 --- a/examples/box_vec.rs +++ b/examples/box_vec.rs @@ -1,7 +1,6 @@ #![feature(plugin)] -#[plugin] -extern crate clippy; +#![plugin(clippy)] pub fn test(foo: Box>) { println!("{:?}", foo.get(0)) diff --git a/examples/dlist.rs b/examples/dlist.rs index 05b71eabdcc0..d4c543b8e9f0 100644 --- a/examples/dlist.rs +++ b/examples/dlist.rs @@ -1,15 +1,14 @@ #![feature(plugin)] -#[plugin] -extern crate clippy; +#![plugin(clippy)] extern crate collections; -use collections::dlist::DList; +use collections::linked_list::LinkedList; -pub fn test(foo: DList) { +pub fn test(foo: LinkedList) { println!("{:?}", foo) } fn main(){ - test(DList::new()); + test(LinkedList::new()); } \ No newline at end of file diff --git a/examples/match_if_let.rs b/examples/match_if_let.rs index 5de96dd9951a..255bea7d73f2 100644 --- a/examples/match_if_let.rs +++ b/examples/match_if_let.rs @@ -1,7 +1,6 @@ #![feature(plugin)] -#[plugin] -extern crate clippy; +#![plugin(clippy)] fn main(){ let x = Some(1u); @@ -19,4 +18,4 @@ fn main(){ (2...3, 7...9) => println!("{:?}", z), _ => {} } -} \ No newline at end of file +} diff --git a/examples/toplevel_ref_arg.rs b/examples/toplevel_ref_arg.rs index 538e377c74f5..3ebb354142a0 100644 --- a/examples/toplevel_ref_arg.rs +++ b/examples/toplevel_ref_arg.rs @@ -1,7 +1,6 @@ #![feature(plugin)] -#[plugin] -extern crate clippy; +#![plugin(clippy)] fn the_answer(ref mut x: u8) { *x = 42; diff --git a/src/lib.rs b/src/lib.rs index 36802d1a3297..b3f395e5a135 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,7 @@ pub fn plugin_registrar(reg: &mut Registry) { reg.register_lint_pass(box misc::MiscPass as LintPassObject); reg.register_lint_pass(box misc::StrToStringPass as LintPassObject); reg.register_lint_pass(box misc::TopLevelRefPass as LintPassObject); - reg.register_lint_group("clippy", vec![types::BOX_VEC, types::DLIST, + reg.register_lint_group("clippy", vec![types::BOX_VEC, types::LINKEDLIST, misc::SINGLE_MATCH, misc::STR_TO_STRING, misc::TOPLEVEL_REF_ARG]); } diff --git a/src/types.rs b/src/types.rs index 17f030c950ff..dceae401a2e2 100644 --- a/src/types.rs +++ b/src/types.rs @@ -12,8 +12,8 @@ pub struct TypePass; declare_lint!(pub BOX_VEC, Warn, "Warn on usage of Box>"); -declare_lint!(pub DLIST, Warn, - "Warn on usage of DList"); +declare_lint!(pub LINKEDLIST, Warn, + "Warn on usage of LinkedList"); /// Matches a type with a provided string, and returns its type parameters if successful pub fn match_ty_unwrap<'a>(ty: &'a Ty, segments: &[&str]) -> Option<&'a [P]> { @@ -48,7 +48,7 @@ pub fn span_note_and_lint(cx: &Context, lint: &'static Lint, span: Span, msg: &s impl LintPass for TypePass { fn get_lints(&self) -> LintArray { - lint_array!(BOX_VEC, DLIST) + lint_array!(BOX_VEC, LINKEDLIST) } fn check_ty(&mut self, cx: &Context, ty: &ast::Ty) { @@ -66,17 +66,17 @@ impl LintPass for TypePass { }); { // In case stuff gets moved around - use collections::dlist::DList as DL1; - use std::collections::dlist::DList as DL2; - use std::collections::DList as DL3; + use collections::linked_list::LinkedList as DL1; + use std::collections::linked_list::LinkedList as DL2; + use std::collections::linked_list::LinkedList as DL3; } - let dlists = [vec!["std","collections","dlist","DList"], - vec!["std","collections","DList"], - vec!["collections","dlist","DList"]]; + let dlists = [vec!["std","collections","linked_list","LinkedList"], + vec!["std","collections","linked_list","LinkedList"], + vec!["collections","linked_list","LinkedList"]]; for path in dlists.iter() { if match_ty_unwrap(ty, path.as_slice()).is_some() { - span_note_and_lint(cx, DLIST, ty.span, - "I see you're using a DList! Perhaps you meant some other data structure?", + span_note_and_lint(cx, LINKEDLIST, ty.span, + "I see you're using a LinkedList! Perhaps you meant some other data structure?", "A RingBuf might work."); return; }