about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-05-24 11:02:23 +0000
committerbors <bors@rust-lang.org>2020-05-24 11:02:23 +0000
commit94fccccd2cdba42aed93ad7715e969ab6aad6301 (patch)
treeaa8d4c31f33695f92860092b05f995d6b2544472 /src/libstd
parent7726070fa755f660b5da3f82f46e07d9c6866f69 (diff)
parente2e3aacc238abe789170a64467b96fe2d7e41174 (diff)
downloadrust-94fccccd2cdba42aed93ad7715e969ab6aad6301.tar.gz
rust-94fccccd2cdba42aed93ad7715e969ab6aad6301.zip
Auto merge of #72529 - RalfJung:rollup-ydthv90, r=RalfJung
Rollup of 3 pull requests

Successful merges:

 - #72284 (Remove `macro_defs` map)
 - #72393 (Rewrite `Parser::collect_tokens`)
 - #72528 (Fix typo in doc comment.)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sync/once.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs
index a3ee14e85d2..7dc822db3d0 100644
--- a/src/libstd/sync/once.rs
+++ b/src/libstd/sync/once.rs
@@ -272,7 +272,7 @@ impl Once {
     /// result in an immediate panic. If `f` panics, the `Once` will remain
     /// in a poison state. If `f` does _not_ panic, the `Once` will no
     /// longer be in a poison state and all future calls to `call_once` or
-    /// `call_one_force` will be no-ops.
+    /// `call_once_force` will be no-ops.
     ///
     /// The closure `f` is yielded a [`OnceState`] structure which can be used
     /// to query the poison status of the `Once`.