mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename #[on_unimplemented] -> #[rustc_on_unimplemented]

Browse Source
This commit is contained in:
Manish Goregaokar 2015-01-11 18:28:06 +05:30
parent add20bbb6d
commit dd074ab4ee
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/iter.rs
View File

@ -101,8 +101,8 @@ pub trait Iterator {
/// Conversion from an `Iterator`
#[stable]
#[on_unimplemented="a collection of type `{Self}` cannot be \
built from an iterator over elements of type `{A}`"]
#[rustc_on_unimplemented="a collection of type `{Self}` cannot be \
built from an iterator over elements of type `{A}`"]
pub trait FromIterator<A> {
/// Build a container with elements from an external iterator.
fn from_iter<T: Iterator<Item=A>>(iterator: T) -> Self;

2
src/librustc/lint/builtin.rs
View File

@ -666,7 +666,7 @@ impl LintPass for UnusedAttributes {
"must_use",
"stable",
"unstable",
"on_unimplemented",
"rustc_on_unimplemented",
// FIXME: #19470 this shouldn't be needed forever
"old_orphan_check",

17
src/librustc/middle/traits/error_reporting.rs
View File

@ -71,7 +71,7 @@ fn report_on_unimplemented<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
let def_id = trait_ref.def_id;
let mut report = None;
ty::each_attr(infcx.tcx, def_id, |item| {
if item.check_name("on_unimplemented") {
if item.check_name("rustc_on_unimplemented") {
let err_sp = if item.meta().span == DUMMY_SP {
span
} else {
@ -99,7 +99,8 @@ fn report_on_unimplemented<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
None => {
infcx.tcx.sess
.span_err(err_sp,
format!("the #[on_unimplemented] attribute on \
format!("the #[rustc_on_unimplemented] \
attribute on \
trait definition for {} refers to \
non-existent type parameter {}",
trait_str, s)
@ -111,10 +112,12 @@ fn report_on_unimplemented<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
_ => {
infcx.tcx.sess
.span_err(err_sp,
format!("the #[on_unimplemented] attribute on \
format!("the #[rustc_on_unimplemented] \
attribute on \
trait definition for {} must have named \
format arguments, \
eg `#[on_unimplemented = \"foo {{T}}\"]`",
eg `#[rustc_on_unimplemented = \
\"foo {{T}}\"]`",
trait_str).as_slice());
errored = true;
None
@ -128,9 +131,9 @@ fn report_on_unimplemented<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
}
} else {
infcx.tcx.sess.span_err(err_sp,
format!("the #[on_unimplemented] attribute on \
format!("the #[rustc_on_unimplemented] attribute on \
trait definition for {} must have a value, \
eg `#[on_unimplemented = \"foo\"]`",
eg `#[rustc_on_unimplemented = \"foo\"]`",
trait_str).as_slice());
}
false
@ -173,7 +176,7 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
"the trait `{}` is not implemented for the type `{}`",
trait_ref.user_string(infcx.tcx),
trait_ref.self_ty().user_string(infcx.tcx)).as_slice());
// Check if it has a custom "#[on_unimplemented]" error message,
// Check if it has a custom "#[rustc_on_unimplemented]" error message,
// report with that message if it does
let custom_note = report_on_unimplemented(infcx, &*trait_ref.0,
obligation.cause.span);

4
src/librustc_typeck/check/mod.rs
View File

@ -783,7 +783,7 @@ fn check_trait_on_unimplemented<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
generics: &ast::Generics,
item: &ast::Item) {
if let Some(ref attr) = item.attrs.iter().find(|&: a| {
a.check_name("on_unimplemented")
a.check_name("rustc_on_unimplemented")
}) {
if let Some(ref istring) = attr.value_str() {
let mut parser = Parser::new(istring.get());
@ -819,7 +819,7 @@ fn check_trait_on_unimplemented<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
} else {
ccx.tcx.sess.span_err(attr.span,
"this attribute must have a value, \
eg `#[on_unimplemented = \"foo\"]`")
eg `#[rustc_on_unimplemented = \"foo\"]`")
}
}
}

8
src/test/compile-fail/on-unimplemented-bad-anno.rs
View File

@ -11,19 +11,19 @@
#[allow(unused)]
#[on_unimplemented = "test error `{Self}` with `{Bar}` `{Baz}` `{Quux}`"]
#[rustc_on_unimplemented = "test error `{Self}` with `{Bar}` `{Baz}` `{Quux}`"]
trait Foo<Bar, Baz, Quux>{}
#[on_unimplemented="a collection of type `{Self}` cannot be built from an iterator over elements of type `{A}`"]
#[rustc_on_unimplemented="a collection of type `{Self}` cannot be built from an iterator over elements of type `{A}`"]
trait MyFromIterator<A> {
/// Build a container with elements from an external iterator.
fn my_from_iter<T: Iterator<Item=A>>(iterator: T) -> Self;
}
#[on_unimplemented] //~ ERROR this attribute must have a value
#[rustc_on_unimplemented] //~ ERROR this attribute must have a value
trait BadAnnotation1 {}
#[on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{C}>`"]
#[rustc_on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{C}>`"]
//~^ ERROR there is no type parameter C on trait BadAnnotation2
trait BadAnnotation2<A,B> {}

4
src/test/compile-fail/on-unimplemented.rs
View File

@ -9,14 +9,14 @@
// except according to those terms.
// ignore-tidy-linelength
#[on_unimplemented = "test error `{Self}` with `{Bar}` `{Baz}` `{Quux}`"]
#[rustc_on_unimplemented = "test error `{Self}` with `{Bar}` `{Baz}` `{Quux}`"]
trait Foo<Bar, Baz, Quux>{}
fn foobar<U: Clone, T: Foo<u8, U, u32>>() -> T {
}
#[on_unimplemented="a collection of type `{Self}` cannot be built from an iterator over elements of type `{A}`"]
#[rustc_on_unimplemented="a collection of type `{Self}` cannot be built from an iterator over elements of type `{A}`"]
trait MyFromIterator<A> {
/// Build a container with elements from an external iterator.
fn my_from_iter<T: Iterator<Item=A>>(iterator: T) -> Self;