Skip to content

Commit eb662b1

Browse files
committed
---
yaml --- r: 227308 b: refs/heads/auto c: 91b3e9c h: refs/heads/master v: v3
1 parent 546d2af commit eb662b1

File tree

14 files changed

+17
-15
lines changed

14 files changed

+17
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 788a802dad3f273b74150b732d24d37a695d29f6
11+
refs/heads/auto: 91b3e9cac0125e35d65169fb7e06166a078296c7
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/libcore/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2623,7 +2623,7 @@ impl<A, St, F> Iterator for Unfold<St, F> where F: FnMut(&mut St) -> Option<A> {
26232623
/// two `Step` objects.
26242624
#[unstable(feature = "step_trait",
26252625
reason = "likely to be replaced by finer-grained traits")]
2626-
pub trait Step: PartialOrd {
2626+
pub trait Step: PartialOrd+Sized {
26272627
/// Steps `self` if possible.
26282628
fn step(&self, by: &Self) -> Option<Self>;
26292629

branches/auto/src/libcore/marker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub trait Sized {
5656
/// Types that can be "unsized" to a dynamically sized type.
5757
#[unstable(feature = "unsize")]
5858
#[lang="unsize"]
59-
pub trait Unsize<T> {
59+
pub trait Unsize<T: ?Sized> {
6060
// Empty.
6161
}
6262

branches/auto/src/libcore/num/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use char::CharExt;
1919
use cmp::{Eq, PartialOrd};
2020
use fmt;
2121
use intrinsics;
22-
use marker::Copy;
22+
use marker::{Copy, Sized};
2323
use mem::size_of;
2424
use option::Option::{self, Some, None};
2525
use result::Result::{self, Ok, Err};
@@ -1264,7 +1264,7 @@ pub enum FpCategory {
12641264
#[doc(hidden)]
12651265
#[unstable(feature = "core_float",
12661266
reason = "stable interface is via `impl f{32,64}` in later crates")]
1267-
pub trait Float {
1267+
pub trait Float: Sized {
12681268
/// Returns the NaN value.
12691269
fn nan() -> Self;
12701270
/// Returns the infinite value.

branches/auto/src/libcore/str/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use default::Default;
2525
use fmt;
2626
use iter::ExactSizeIterator;
2727
use iter::{Map, Iterator, DoubleEndedIterator};
28+
use marker::Sized;
2829
use mem;
2930
use ops::{Fn, FnMut, FnOnce};
3031
use option::Option::{self, None, Some};
@@ -37,7 +38,7 @@ pub mod pattern;
3738
/// A trait to abstract the idea of creating a new instance of a type from a
3839
/// string.
3940
#[stable(feature = "rust1", since = "1.0.0")]
40-
pub trait FromStr {
41+
pub trait FromStr: Sized {
4142
/// The associated error which can be returned from parsing.
4243
#[stable(feature = "rust1", since = "1.0.0")]
4344
type Err;

branches/auto/src/libgraphviz/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ pub type Edges<'a,E> = Cow<'a,[E]>;
561561
/// `Cow<[T]>` to leave implementers the freedom to create
562562
/// entirely new vectors or to pass back slices into internally owned
563563
/// vectors.
564-
pub trait GraphWalk<'a, N, E> {
564+
pub trait GraphWalk<'a, N: Clone, E: Clone> {
565565
/// Returns all the nodes in this graph.
566566
fn nodes(&'a self) -> Nodes<'a, N>;
567567
/// Returns all of the edges in this graph.

branches/auto/src/librand/distributions/range.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
1313
// this is surprisingly complicated to be both generic & correct
1414

15+
use core::marker::Sized;
1516
use Rng;
1617
use distributions::{Sample, IndependentSample};
1718

@@ -57,7 +58,7 @@ impl<Sup: SampleRange> IndependentSample<Sup> for Range<Sup> {
5758
/// uniformly between two values. This should not be used directly,
5859
/// and is only to facilitate `Range`.
5960
#[doc(hidden)]
60-
pub trait SampleRange {
61+
pub trait SampleRange: Sized {
6162
/// Construct the `Range` object that `sample_range`
6263
/// requires. This should not ever be called directly, only via
6364
/// `Range::new`, which will check that `low < high`, so this

branches/auto/src/librustc/middle/astencode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
10611061
}
10621062
}
10631063

1064-
trait doc_decoder_helpers {
1064+
trait doc_decoder_helpers: Sized {
10651065
fn as_int(&self) -> isize;
10661066
fn opt_child(&self, tag: c::astencode_tag) -> Option<Self>;
10671067
}

branches/auto/src/librustc/middle/expr_use_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ impl OverloadedCallType {
239239
// supplies types from the tree. After type checking is complete, you
240240
// can just use the tcx as the typer.
241241

242-
pub struct ExprUseVisitor<'d,'t,'a: 't, 'tcx:'a> {
242+
pub struct ExprUseVisitor<'d, 't, 'a: 't, 'tcx:'a+'d> {
243243
typer: &'t infer::InferCtxt<'a, 'tcx>,
244244
mc: mc::MemCategorizationContext<'t, 'a, 'tcx>,
245245
delegate: &'d mut (Delegate<'tcx>+'d),

branches/auto/src/librustc_data_structures/unify/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ impl<'tcx,K> UnificationTable<K>
272272

273273
impl<'tcx,K,V> UnificationTable<K>
274274
where K: UnifyKey<Value=Option<V>>,
275-
V: Clone+PartialEq,
275+
V: Clone+PartialEq+Debug,
276276
{
277277
pub fn unify_var_var(&mut self,
278278
a_id: K,

branches/auto/src/libserialize/serialize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ pub trait Encodable {
194194
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error>;
195195
}
196196

197-
pub trait Decodable {
197+
pub trait Decodable: Sized {
198198
fn decode<D: Decoder>(d: &mut D) -> Result<Self, D::Error>;
199199
}
200200

branches/auto/src/libstd/sync/mutex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ mod tests {
369369
use sync::{Arc, Mutex, StaticMutex, Condvar};
370370
use thread;
371371

372-
struct Packet<T: Send>(Arc<(Mutex<T>, Condvar)>);
372+
struct Packet<T>(Arc<(Mutex<T>, Condvar)>);
373373

374374
unsafe impl<T: Send> Send for Packet<T> {}
375375
unsafe impl<T> Sync for Packet<T> {}

branches/auto/src/libstd/thread/local.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub use self::imp::Key as __KeyInner;
6060
/// });
6161
/// ```
6262
#[stable(feature = "rust1", since = "1.0.0")]
63-
pub struct LocalKey<T> {
63+
pub struct LocalKey<T:'static> {
6464
// The key itself may be tagged with #[thread_local], and this `Key` is
6565
// stored as a `static`, and it's not valid for a static to reference the
6666
// address of another thread_local static. For this reason we kinda wonkily

branches/auto/src/libstd/thread/scoped_tls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub use self::imp::KeyInner as __KeyInner;
5555
#[unstable(feature = "scoped_tls",
5656
reason = "scoped TLS has yet to have wide enough use to fully consider \
5757
stabilizing its interface")]
58-
pub struct ScopedKey<T> { inner: fn() -> &'static imp::KeyInner<T> }
58+
pub struct ScopedKey<T:'static> { inner: fn() -> &'static imp::KeyInner<T> }
5959

6060
/// Declare a new scoped thread local storage key.
6161
///

0 commit comments

Comments
 (0)