diff options
| author | Michael Goulet <michael@errs.io> | 2022-10-02 06:57:01 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2022-11-05 18:05:44 +0000 |
| commit | d9891563d30375df1854dd2ec0271ac3d058e10c (patch) | |
| tree | 2efc7b561945f04a321015cad1caf2226f19101a /library/core/src/ops/function.rs | |
| parent | 29dccfe9e498f41169c120e515494cdd9b5b3e11 (diff) | |
| download | rust-d9891563d30375df1854dd2ec0271ac3d058e10c.tar.gz rust-d9891563d30375df1854dd2ec0271ac3d058e10c.zip | |
Merge conflicts and rebase onto master
Diffstat (limited to 'library/core/src/ops/function.rs')
| -rw-r--r-- | library/core/src/ops/function.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/library/core/src/ops/function.rs b/library/core/src/ops/function.rs index 7c93fd30d4e..8d4b0a7ccac 100644 --- a/library/core/src/ops/function.rs +++ b/library/core/src/ops/function.rs @@ -75,7 +75,6 @@ use crate::marker::Tuple; )] #[fundamental] // so that regex can rely that `&str: !FnMut` #[must_use = "closures are lazy and do nothing unless called"] -#[cfg_attr(not(bootstrap), const_trait)] pub trait Fn<Args>: FnMut<Args> { /// Performs the call operation. #[unstable(feature = "fn_traits", issue = "29625")] @@ -245,7 +244,6 @@ pub trait Fn<Args: Tuple>: FnMut<Args> { )] #[fundamental] // so that regex can rely that `&str: !FnMut` #[must_use = "closures are lazy and do nothing unless called"] -#[cfg_attr(not(bootstrap), const_trait)] pub trait FnMut<Args>: FnOnce<Args> { /// Performs the call operation. #[unstable(feature = "fn_traits", issue = "29625")] @@ -415,7 +413,6 @@ pub trait FnMut<Args: Tuple>: FnOnce<Args> { )] #[fundamental] // so that regex can rely that `&str: !FnMut` #[must_use = "closures are lazy and do nothing unless called"] -#[cfg_attr(not(bootstrap), const_trait)] pub trait FnOnce<Args> { /// The returned type after the call operator is used. #[lang = "fn_once_output"] |