From a8d7f110b34a778cc5d6e60b25e9ea3a822b7fef Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Fri, 11 Mar 2016 02:56:07 +0000 Subject: [PATCH] Fix build failure on FreeBSD, due to useless allocations. This stability annotation is useless src/libcore/result.rs:257 Err(#[stable(feature = "rust1", since = "1.0.0")] E) --- src/libcore/option.rs | 2 +- src/libcore/result.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 56b84fd6a64dd..3580a80c80610 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -169,7 +169,7 @@ pub enum Option { None, /// Some value `T` #[stable(feature = "rust1", since = "1.0.0")] - Some(#[stable(feature = "rust1", since = "1.0.0")] T) + Some(T) } ///////////////////////////////////////////////////////////////////////////// diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 09f612c20ecdf..82421f6575c95 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -250,11 +250,11 @@ use option::Option::{self, None, Some}; pub enum Result { /// Contains the success value #[stable(feature = "rust1", since = "1.0.0")] - Ok(#[stable(feature = "rust1", since = "1.0.0")] T), + Ok(T), /// Contains the error value #[stable(feature = "rust1", since = "1.0.0")] - Err(#[stable(feature = "rust1", since = "1.0.0")] E) + Err(E) } /////////////////////////////////////////////////////////////////////////////