Skip to content

Commit a278563

Browse files
committed
---
yaml --- r: 174414 b: refs/heads/auto c: 70f7165 h: refs/heads/master v: v3
1 parent 32da976 commit a278563

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+862
-1557
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 7f8c687fdfbf076ef1667f4d95633d4e0812b516
13+
refs/heads/auto: 70f7165cc8975337964118af4d30f40b98f5edeb
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/liballoc/boxed.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,21 @@ impl<S: hash::Hasher, T: ?Sized + Hash<S>> Hash<S> for Box<T> {
125125
}
126126

127127
/// Extension methods for an owning `Any` trait object.
128-
#[unstable = "post-DST and coherence changes, this will not be a trait but \
129-
rather a direct `impl` on `Box<Any>`"]
128+
#[unstable = "this trait will likely disappear once compiler bugs blocking \
129+
a direct impl on `Box<Any>` have been fixed "]
130+
// FIXME(#18737): this should be a direct impl on `Box<Any>`. If you're
131+
// removing this please make sure that you can downcase on
132+
// `Box<Any + Send>` as well as `Box<Any>`
130133
pub trait BoxAny {
131134
/// Returns the boxed value if it is of type `T`, or
132135
/// `Err(Self)` if it isn't.
133136
#[stable]
134137
fn downcast<T: 'static>(self) -> Result<Box<T>, Self>;
135138
}
136139

140+
#[stable]
137141
impl BoxAny for Box<Any> {
138142
#[inline]
139-
#[unstable = "method may be renamed with respect to other downcasting \
140-
methods"]
141143
fn downcast<T: 'static>(self) -> Result<Box<T>, Box<Any>> {
142144
if self.is::<T>() {
143145
unsafe {

branches/auto/src/libcollections/btree/map.rs

Lines changed: 118 additions & 333 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)