diff options
| author | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
| commit | 86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7 (patch) | |
| tree | c3752892cdc43bf31324ebea11371fa503981bd4 /src/libcore/ops/function.rs | |
| parent | 8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e (diff) | |
| parent | 8321b3fbe44b1edc9b6d012daeaf46ae2b6bc3c8 (diff) | |
| download | rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.tar.gz rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.zip | |
Auto merge of #74395 - Mark-Simulacrum:stage0-next, r=pietroalbini
Bump version to 1.47 This also bumps to a more recent rustfmt version, just to keep us relatively up to date (though almost nothing has changed in rustfmt we use beyond bumps to the parser infra). No formatting changes as a result of this. r? @pietroalbini
Diffstat (limited to 'src/libcore/ops/function.rs')
| -rw-r--r-- | src/libcore/ops/function.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/ops/function.rs b/src/libcore/ops/function.rs index 2cdfee87a35..22a738d0bc1 100644 --- a/src/libcore/ops/function.rs +++ b/src/libcore/ops/function.rs @@ -224,7 +224,7 @@ pub trait FnMut<Args>: FnOnce<Args> { #[must_use = "closures are lazy and do nothing unless called"] pub trait FnOnce<Args> { /// The returned type after the call operator is used. - #[cfg_attr(not(bootstrap), lang = "fn_once_output")] + #[lang = "fn_once_output"] #[stable(feature = "fn_once_output", since = "1.12.0")] type Output; |