rollup merge of #21362: aochagavia/copy_rawptr

Fixes #21272 and #21296

r? @cmr
This commit is contained in:
Alex Crichton 2015-02-02 10:56:07 -08:00
commit a392d9131e
2 changed files with 24 additions and 1 deletions

View File

@ -592,7 +592,15 @@ impl LintPass for RawPointerDerive {
return
}
let did = match item.node {
ast::ItemImpl(..) => {
ast::ItemImpl(_, _, _, ref t_ref_opt, _, _) => {
// Deriving the Copy trait does not cause a warning
if let &Some(ref trait_ref) = t_ref_opt {
let def_id = ty::trait_ref_to_def_id(cx.tcx, trait_ref);
if Some(def_id) == cx.tcx.lang_items.copy_trait() {
return
}
}
match ty::node_id_to_type(cx.tcx, item.id).sty {
ty::ty_enum(did, _) => did,
ty::ty_struct(did, _) => did,

View File

@ -0,0 +1,15 @@
// Copyright 2014 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 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#[forbid(raw_pointer_derive)]
#[derive(Copy)]
struct Test(*const i32);
fn main() {}