diff --git a/RELEASES.md b/RELEASES.md index 3b4f4182702d1..48bd13105bbea 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,11 @@ +Version 1.34.2 (2019-05-14) +=========================== + +* [Destabilize the `Error::type_id` function due to a security + vulnerability][60785] + +[60785]: https://github.com/rust-lang/rust/pull/60785 + Version 1.34.1 (2019-04-25) =========================== diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index d12094867b20b..89cc99728c54f 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -14,7 +14,7 @@ use crate::Build; use crate::config::Config; // The version number -pub const CFG_RELEASE_NUM: &str = "1.34.1"; +pub const CFG_RELEASE_NUM: &str = "1.34.2"; pub struct GitInfo { inner: Option, diff --git a/src/libstd/error.rs b/src/libstd/error.rs index aec85b660cae0..41891e2a4c2d6 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -196,7 +196,10 @@ pub trait Error: Debug + Display { fn source(&self) -> Option<&(dyn Error + 'static)> { None } /// Gets the `TypeId` of `self` - #[stable(feature = "error_type_id", since = "1.34.0")] + #[doc(hidden)] + #[unstable(feature = "error_type_id", + reason = "this is memory unsafe to override in user code", + issue = "60784")] fn type_id(&self) -> TypeId where Self: 'static { TypeId::of::() }