about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-01-05 23:56:56 +0800
committerGitHub <noreply@github.com>2019-01-05 23:56:56 +0800
commite1a1ab08361213e545136c51c52144acff1678d0 (patch)
tree8b1be4a374dbc334ca876e46b44edbbfb60aca44 /src/libstd
parentdfc1037757ed5d78c982fbe5a8daf3d8846027da (diff)
parent3fb42cfb7c3932004a9a7295b5e19f28f0f7fff2 (diff)
downloadrust-e1a1ab08361213e545136c51c52144acff1678d0.tar.gz
rust-e1a1ab08361213e545136c51c52144acff1678d0.zip
Rollup merge of #57312 - Mendess2526:master, r=Centril
`const fn` is no longer coming soon (const keyword docs)

The `const` keyword [documentation](https://doc.rust-lang.org/std/keyword.const.html) mentions that `const fn`s are coming soon, but they have already been added.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/keyword_docs.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/keyword_docs.rs b/src/libstd/keyword_docs.rs
index 262930e08c0..a7ecee2d822 100644
--- a/src/libstd/keyword_docs.rs
+++ b/src/libstd/keyword_docs.rs
@@ -47,8 +47,8 @@ mod as_keyword { }
 ///
 /// Constants must be explicitly typed, unlike with `let` you can't ignore its type and let the
 /// compiler figure it out. Any constant value can be defined in a const, which in practice happens
-/// to be most things that would be reasonable to have a constant (barring `const fn`s, coming
-/// soon). For example, you can't have a File as a `const`.
+/// to be most things that would be reasonable to have a constant (barring `const fn`s). For
+/// example, you can't have a File as a `const`.
 ///
 /// The only lifetime allowed in a constant is `'static`, which is the lifetime that encompasses
 /// all others in a Rust program. For example, if you wanted to define a constant string, it would