diff options
| author | bors <bors@rust-lang.org> | 2015-01-12 04:45:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-12 04:45:18 +0000 |
| commit | 0aec4db1c09574da2f30e3844de6d252d79d4939 (patch) | |
| tree | 64ef8983eb848612559f373ab7069e033672745f /src/libcore | |
| parent | 15a41380c14e94052332360b104ec1651f97297b (diff) | |
| parent | 02d0a8bbcf0a64339e4279c4ddb4841189ba5069 (diff) | |
| download | rust-0aec4db1c09574da2f30e3844de6d252d79d4939.tar.gz rust-0aec4db1c09574da2f30e3844de6d252d79d4939.zip | |
auto merge of #20889 : Manishearth/rust/trait-error, r=nikomatsakis
fixes #20783 r? @nikomatsakis
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/iter.rs | 2 | ||||
| -rw-r--r-- | src/libcore/lib.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index 849080e8a82..5ed77852ad0 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -101,6 +101,8 @@ pub trait Iterator { /// Conversion from an `Iterator` #[stable] +#[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; diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 28f8cf588be..78e8a2a9e91 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -63,6 +63,7 @@ #![feature(simd, unsafe_destructor, slicing_syntax)] #![feature(unboxed_closures)] #![allow(unknown_features)] #![feature(int_uint)] +#![feature(on_unimplemented)] #![deny(missing_docs)] #[macro_use] |