about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-09 14:42:00 +0000
committerbors <bors@rust-lang.org>2015-09-09 14:42:00 +0000
commit3a4fb823e26c512d14d97bd86e2ac7b1e7d3d0fa (patch)
tree1c2d3e2fec6a51c47b1ae12f44958a79b43d0169 /src/libstd
parent7c8ae608dc65665039f3aeb01548d675953a2a68 (diff)
parent519a186773c2b972f84fd499f57ce52400bbdcf1 (diff)
downloadrust-3a4fb823e26c512d14d97bd86e2ac7b1e7d3d0fa.tar.gz
rust-3a4fb823e26c512d14d97bd86e2ac7b1e7d3d0fa.zip
Auto merge of #28316 - Manishearth:rollup, r=Manishearth
- Successful merges: #28281, #28283, #28289, #28294, #28295, #28305
- Failed merges: 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/macros.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index e4866982176..a0c3f013f2b 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -412,9 +412,9 @@ pub mod builtin {
     #[macro_export]
     macro_rules! include_str { ($file:expr) => ({ /* compiler built-in */ }) }
 
-    /// Includes a file as a byte slice.
+    /// Includes a file as a reference to a byte array.
     ///
-    /// This macro will yield an expression of type `&'static [u8]` which is
+    /// This macro will yield an expression of type `&'static [u8; N]` which is
     /// the contents of the filename specified. The file is located relative to
     /// the current file (similarly to how modules are found),
     ///