about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-04 23:35:21 +0000
committerbors <bors@rust-lang.org>2017-06-04 23:35:21 +0000
commitc94a9ac8ae33e6580940e02abb425dd2fe69b5d8 (patch)
tree6b5e874cfd9224b1d35bf63554a579c4049aaa70 /src/libstd
parent0418fa9d382a47d782cc1e195c14573be9c32095 (diff)
parent4bda94d0d820bf7baf2e97ec3552fe290b826391 (diff)
downloadrust-c94a9ac8ae33e6580940e02abb425dd2fe69b5d8.tar.gz
rust-c94a9ac8ae33e6580940e02abb425dd2fe69b5d8.zip
Auto merge of #42426 - arthurprs:io_error, r=sfackler
Inline io::Error creation from ErrorKind

Faster and smaller code for mio and tokio (PRs on those to follow)
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/error.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs
index fb67eaf3c63..0a5804a7744 100644
--- a/src/libstd/io/error.rs
+++ b/src/libstd/io/error.rs
@@ -208,6 +208,7 @@ impl ErrorKind {
 /// the heap (for normal construction via Error::new) is too costly.
 #[stable(feature = "io_error_from_errorkind", since = "1.14.0")]
 impl From<ErrorKind> for Error {
+    #[inline]
     fn from(kind: ErrorKind) -> Error {
         Error {
             repr: Repr::Simple(kind)