about summary refs log tree commit diff
path: root/src/libstd/path
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-28 17:16:48 -0700
committerbors <bors@rust-lang.org>2014-03-28 17:16:48 -0700
commitff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c (patch)
treef398acb54f2432247f3c174555010b3055cd7133 /src/libstd/path
parentcbfc0a5e33eb3d97a2995d120536b8dadc0cc0a2 (diff)
parent451e8c1c6178750a4c1789f40749562164a980b7 (diff)
downloadrust-ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c.tar.gz
rust-ff733c767a2ac48e5f94a37bc8ed3d2f1bc1141c.zip
auto merge of #13162 : alexcrichton/rust/attr-syntax, r=brson
This is the rebasing of #13068 with a fix for #13067 as the first commit.
Diffstat (limited to 'src/libstd/path')
-rw-r--r--src/libstd/path/windows.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index d488997b0c2..a641787dfd1 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -637,7 +637,7 @@ impl Path {
     /// See str_components() for details.
     pub fn components<'a>(&'a self) -> Components<'a> {
         fn convert<'a>(x: Option<&'a str>) -> &'a [u8] {
-            #[inline];
+            #![inline]
             x.unwrap().as_bytes()
         }
         self.str_components().map(convert)
@@ -647,7 +647,7 @@ impl Path {
     /// See str_components() for details.
     pub fn rev_components<'a>(&'a self) -> RevComponents<'a> {
         fn convert<'a>(x: Option<&'a str>) -> &'a [u8] {
-            #[inline];
+            #![inline]
             x.unwrap().as_bytes()
         }
         self.rev_str_components().map(convert)