Skip to content

Commit dd35c72

Browse files
committed
---
yaml --- r: 182342 b: refs/heads/beta c: 70f7165 h: refs/heads/master v: v3
1 parent 7cda2de commit dd35c72

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
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 7f8c687fdfbf076ef1667f4d95633d4e0812b516
34+
refs/heads/beta: 70f7165cc8975337964118af4d30f40b98f5edeb
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/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/beta/src/libcollections/btree/map.rs

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

0 commit comments

Comments
 (0)