about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-08 02:36:15 +0000
committerbors <bors@rust-lang.org>2017-12-08 02:36:15 +0000
commit5f4b09ee480aab38e466700563e2a6276f9a73e7 (patch)
treeae12c58f6a6c0ab6e569d1f3b8ffff74b2de94cb /src/libstd
parentc8ddf28527119a06a9f5da9bd34c97ae97afe531 (diff)
parent0b47f0226760ae059f011006342833564cfa40ae (diff)
downloadrust-5f4b09ee480aab38e466700563e2a6276f9a73e7.tar.gz
rust-5f4b09ee480aab38e466700563e2a6276f9a73e7.zip
Auto merge of #46574 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests

- Successful merges: #46416, #46444, #46526, #46539, #46548
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/macros.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index b36473d9b75..de46fedaebb 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -631,7 +631,7 @@ pub mod builtin {
     #[macro_export]
     macro_rules! module_path { () => ({ /* compiler built-in */ }) }
 
-    /// Boolean evaluation of configuration flags.
+    /// Boolean evaluation of configuration flags, at compile-time.
     ///
     /// In addition to the `#[cfg]` attribute, this macro is provided to allow
     /// boolean expression evaluation of configuration flags. This frequently