From 8cebb1f64498508e1fc940d885ad05d7a2fb4089 Mon Sep 17 00:00:00 2001 From: Chase Southwood Date: Sun, 4 Jan 2015 00:09:18 -0600 Subject: Rename `raw_pointer_deriving` lint to `raw_pointer_derive` Due to the `#[deriving]` -> `#[derive]` switch. --- src/librustc/lint/builtin.rs | 22 ++++++++--------- src/librustc/lint/context.rs | 3 ++- src/test/compile-fail/lint-raw-ptr-derive.rs | 34 ++++++++++++++++++++++++++ src/test/compile-fail/lint-raw-ptr-deriving.rs | 34 -------------------------- 4 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 src/test/compile-fail/lint-raw-ptr-derive.rs delete mode 100644 src/test/compile-fail/lint-raw-ptr-deriving.rs (limited to 'src') diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index 53249c72462..e44e3154d3d 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -550,20 +550,20 @@ impl LintPass for BoxPointers { } declare_lint! { - RAW_POINTER_DERIVING, + RAW_POINTER_DERIVE, Warn, "uses of #[derive] with raw pointers are rarely correct" } -struct RawPtrDerivingVisitor<'a, 'tcx: 'a> { +struct RawPtrDeriveVisitor<'a, 'tcx: 'a> { cx: &'a Context<'a, 'tcx> } -impl<'a, 'tcx, 'v> Visitor<'v> for RawPtrDerivingVisitor<'a, 'tcx> { +impl<'a, 'tcx, 'v> Visitor<'v> for RawPtrDeriveVisitor<'a, 'tcx> { fn visit_ty(&mut self, ty: &ast::Ty) { static MSG: &'static str = "use of `#[derive]` with a raw pointer"; if let ast::TyPtr(..) = ty.node { - self.cx.span_lint(RAW_POINTER_DERIVING, ty.span, MSG); + self.cx.span_lint(RAW_POINTER_DERIVE, ty.span, MSG); } visit::walk_ty(self, ty); } @@ -572,21 +572,21 @@ impl<'a, 'tcx, 'v> Visitor<'v> for RawPtrDerivingVisitor<'a, 'tcx> { fn visit_block(&mut self, _: &ast::Block) {} } -pub struct RawPointerDeriving { +pub struct RawPointerDerive { checked_raw_pointers: NodeSet, } -impl RawPointerDeriving { - pub fn new() -> RawPointerDeriving { - RawPointerDeriving { +impl RawPointerDerive { + pub fn new() -> RawPointerDerive { + RawPointerDerive { checked_raw_pointers: NodeSet::new(), } } } -impl LintPass for RawPointerDeriving { +impl LintPass for RawPointerDerive { fn get_lints(&self) -> LintArray { - lint_array!(RAW_POINTER_DERIVING) + lint_array!(RAW_POINTER_DERIVE) } fn check_item(&mut self, cx: &Context, item: &ast::Item) { @@ -611,7 +611,7 @@ impl LintPass for RawPointerDeriving { if !self.checked_raw_pointers.insert(item.id) { return } match item.node { ast::ItemStruct(..) | ast::ItemEnum(..) => { - let mut visitor = RawPtrDerivingVisitor { cx: cx }; + let mut visitor = RawPtrDeriveVisitor { cx: cx }; visit::walk_item(&mut visitor, &*item); } _ => {} diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs index ffae485364a..9cf4ae9d467 100644 --- a/src/librustc/lint/context.rs +++ b/src/librustc/lint/context.rs @@ -208,7 +208,7 @@ impl LintStore { add_builtin_with_new!(sess, TypeLimits, - RawPointerDeriving, + RawPointerDerive, MissingDoc, ); @@ -247,6 +247,7 @@ impl LintStore { self.register_renamed("unknown_crate_type", "unknown_crate_types"); self.register_renamed("variant_size_difference", "variant_size_differences"); self.register_renamed("transmute_fat_ptr", "fat_ptr_transmutes"); + self.register_renamed("raw_pointer_deriving", "raw_pointer_derive"); } diff --git a/src/test/compile-fail/lint-raw-ptr-derive.rs b/src/test/compile-fail/lint-raw-ptr-derive.rs new file mode 100644 index 00000000000..3198e782df8 --- /dev/null +++ b/src/test/compile-fail/lint-raw-ptr-derive.rs @@ -0,0 +1,34 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![allow(dead_code)] +#![deny(raw_pointer_derive)] + +#[derive(Clone)] +struct Foo { + x: *const int //~ ERROR use of `#[derive]` with a raw pointer +} + +#[derive(Clone)] +struct Bar(*mut int); //~ ERROR use of `#[derive]` with a raw pointer + +#[derive(Clone)] +enum Baz { + A(*const int), //~ ERROR use of `#[derive]` with a raw pointer + B { x: *mut int } //~ ERROR use of `#[derive]` with a raw pointer +} + +#[derive(Clone)] +struct Buzz { + x: (*const int, //~ ERROR use of `#[derive]` with a raw pointer + *const uint) //~ ERROR use of `#[derive]` with a raw pointer +} + +fn main() {} diff --git a/src/test/compile-fail/lint-raw-ptr-deriving.rs b/src/test/compile-fail/lint-raw-ptr-deriving.rs deleted file mode 100644 index 6fe8862d77e..00000000000 --- a/src/test/compile-fail/lint-raw-ptr-deriving.rs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#![allow(dead_code)] -#![deny(raw_pointer_deriving)] - -#[derive(Clone)] -struct Foo { - x: *const int //~ ERROR use of `#[derive]` with a raw pointer -} - -#[derive(Clone)] -struct Bar(*mut int); //~ ERROR use of `#[derive]` with a raw pointer - -#[derive(Clone)] -enum Baz { - A(*const int), //~ ERROR use of `#[derive]` with a raw pointer - B { x: *mut int } //~ ERROR use of `#[derive]` with a raw pointer -} - -#[derive(Clone)] -struct Buzz { - x: (*const int, //~ ERROR use of `#[derive]` with a raw pointer - *const uint) //~ ERROR use of `#[derive]` with a raw pointer -} - -fn main() {} -- cgit 1.4.1-3-g733a5