bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #24133 - kballard:add-sync-to-io-error, r=alexcrichton

Browse source 
This allows `io::Error` values to be stored in `Arc` properly.

Because this requires `Sync` of any value passed to `io::Error::new()`
and modifies the relevant `convert::From` impls, this is a

[breaking-change]

Fixes #24049.
This commit is contained in:
bors 2015-04-18 02:53:53 +00:00
commit efa6a46a8e
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstd/error.rs
View file

@ -50,7 +50,7 @@
use boxed::Box; use boxed::Box;
use convert::From; use convert::From;
use fmt::{self, Debug, Display}; use fmt::{self, Debug, Display};
use marker::Send; use marker::{Send, Sync};
use num; use num;
use option::Option; use option::Option;
use option::Option::None; use option::Option::None;
@ -81,15 +81,15 @@ impl<'a, E: Error + 'a> From<E> for Box<Error + 'a> {
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<'a, E: Error + Send + 'a> From<E> for Box<Error + Send + 'a> { impl<'a, E: Error + Send + Sync + 'a> From<E> for Box<Error + Send + Sync + 'a> {
fn from(err: E) -> Box<Error + Send + 'a> { fn from(err: E) -> Box<Error + Send + Sync + 'a> {
Box::new(err) Box::new(err)
} }
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl From<String> for Box<Error + Send> { impl From<String> for Box<Error + Send + Sync> {
fn from(err: String) -> Box<Error + Send> { fn from(err: String) -> Box<Error + Send + Sync> {
#[derive(Debug)] #[derive(Debug)]
struct StringError(String); struct StringError(String);
@ -108,8 +108,8 @@ impl From<String> for Box<Error + Send> {
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<'a, 'b> From<&'b str> for Box<Error + Send + 'a> { impl<'a, 'b> From<&'b str> for Box<Error + Send + Sync + 'a> {
fn from(err: &'b str) -> Box<Error + Send + 'a> { fn from(err: &'b str) -> Box<Error + Send + Sync + 'a> {
From::from(String::from_str(err)) From::from(String::from_str(err))
} }
} }

11
src/libstd/io/error.rs
View file

@ -12,7 +12,7 @@ use boxed::Box;
use convert::Into; use convert::Into;
use error; use error;
use fmt; use fmt;
use marker::Send; use marker::{Send, Sync};
use option::Option::{self, Some, None}; use option::Option::{self, Some, None};
use result; use result;
use sys; use sys;
@ -46,7 +46,7 @@ enum Repr {
#[derive(Debug)] #[derive(Debug)]
struct Custom { struct Custom {
kind: ErrorKind, kind: ErrorKind,
error: Box<error::Error+Send>, error: Box<error::Error+Send+Sync>,
} }
/// A list specifying general categories of I/O error. /// A list specifying general categories of I/O error.
@ -146,7 +146,7 @@ impl Error {
/// ``` /// ```
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn new<E>(kind: ErrorKind, error: E) -> Error pub fn new<E>(kind: ErrorKind, error: E) -> Error
where E: Into<Box<error::Error+Send>> where E: Into<Box<error::Error+Send+Sync>>
{ {
Error { Error {
repr: Repr::Custom(Box::new(Custom { repr: Repr::Custom(Box::new(Custom {
@ -223,3 +223,8 @@ impl error::Error for Error {
} }
} }
} }
fn _assert_error_is_sync_send() {
fn _is_sync_send<T: Sync+Send>() {}
_is_sync_send::<Error>();
}