about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2015-01-26 14:02:23 -0800
committerBrian Anderson <banderson@mozilla.com>2015-01-26 15:42:32 -0800
commit5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f (patch)
treeb258f900721206035f33e5fcc229474d19448569 /src/doc
parentd179ba3b8eb65c951b68f6c52da3aba82806a3a1 (diff)
parent16286f5cf921a9de463d8a744c33f49837698c3d (diff)
downloadrust-5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f.tar.gz
rust-5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f.zip
Merge remote-tracking branch 'rust-lang/master'
Conflicts:
	src/librustc/lint/builtin.rs
	src/librustc/lint/context.rs
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/reference.md4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md
index db025ddcc5d..a52100c4cdd 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -2418,10 +2418,6 @@ The currently implemented features of the reference compiler are:
                        for now until the specification of identifiers is fully
                        fleshed out.
 
-* `once_fns` - Onceness guarantees a closure is only executed once. Defining a
-               closure as `once` is unlikely to be supported going forward. So
-               they are hidden behind this feature until they are to be removed.
-
 * `plugin` - Usage of [compiler plugins][plugin] for custom lints or syntax extensions.
              These depend on compiler internals and are subject to change.