From 90ec4228bef1f7aa9612ddff03d21f7a260d4441 Mon Sep 17 00:00:00 2001 From: Bill Myers Date: Sat, 8 Jun 2013 22:36:33 +0200 Subject: [PATCH 1/2] fix decoding of multiple attributes (fixes #7017) We were just looking at the last because we were overwriting ret. --- src/librustc/middle/ty.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index e8501904c6f25..93f3d68c9261e 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -4043,7 +4043,7 @@ pub fn has_attr(tcx: ctxt, did: def_id, attr: &str) -> bool { } else { let mut ret = false; do csearch::get_item_attrs(tcx.cstore, did) |meta_items| { - ret = attr::contains_name(meta_items, attr); + ret = ret || attr::contains_name(meta_items, attr); } ret } From 54ec7ab057018fac886039108d02300025e223a0 Mon Sep 17 00:00:00 2001 From: Bill Myers Date: Sat, 8 Jun 2013 23:20:36 +0200 Subject: [PATCH 2/2] add test for RcMut being Const and Owned, tests #7017 being fixed --- .../rcmut-not-const-and-not-owned.rs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/test/compile-fail/rcmut-not-const-and-not-owned.rs diff --git a/src/test/compile-fail/rcmut-not-const-and-not-owned.rs b/src/test/compile-fail/rcmut-not-const-and-not-owned.rs new file mode 100644 index 0000000000000..9e7236a67d96f --- /dev/null +++ b/src/test/compile-fail/rcmut-not-const-and-not-owned.rs @@ -0,0 +1,20 @@ +// 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. + +extern mod extra; + +fn o(_: &T) {} +fn c(_: &T) {} + +fn main() { + let x = extra::rc::rc_mut_from_owned(0); + o(&x); //~ ERROR instantiating a type parameter with an incompatible type `extra::rc::RcMut`, which does not fulfill `Owned` + c(&x); //~ ERROR instantiating a type parameter with an incompatible type `extra::rc::RcMut`, which does not fulfill `Const` +}