diff options
| author | bors <bors@rust-lang.org> | 2023-04-19 13:03:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-19 13:03:40 +0000 |
| commit | 3a5c8e91f094bb1cb1346651fe3512f0b603d826 (patch) | |
| tree | 9768f32e150f510ea6fa2dd3552ac91080657ca3 /compiler/rustc_ast/src | |
| parent | d7f9e81650dcee3e2d5ad1973a71da644a2eff93 (diff) | |
| parent | 14d1e87db9bf5e9c3dc8cfe7a0558d260b1e5ff2 (diff) | |
| download | rust-3a5c8e91f094bb1cb1346651fe3512f0b603d826.tar.gz rust-3a5c8e91f094bb1cb1346651fe3512f0b603d826.zip | |
Auto merge of #110393 - fee1-dead-contrib:rm-const-traits, r=oli-obk
Rm const traits in libcore See [zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/146212-t-compiler.2Fconst-eval/topic/.60const.20Trait.60.20removal.20or.20rework) * [x] Bless ui tests * [ ] Re constify some unstable functions with workarounds if they are needed
Diffstat (limited to 'compiler/rustc_ast/src')
| -rw-r--r-- | compiler/rustc_ast/src/lib.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_ast/src/ptr.rs | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_ast/src/lib.rs b/compiler/rustc_ast/src/lib.rs index 23c32fa96ca..b07ed1d1c74 100644 --- a/compiler/rustc_ast/src/lib.rs +++ b/compiler/rustc_ast/src/lib.rs @@ -10,7 +10,6 @@ )] #![feature(associated_type_bounds)] #![feature(box_patterns)] -#![feature(const_default_impls)] #![feature(const_trait_impl)] #![feature(if_let_guard)] #![feature(let_chains)] diff --git a/compiler/rustc_ast/src/ptr.rs b/compiler/rustc_ast/src/ptr.rs index 4b2850336a0..0140fb752bf 100644 --- a/compiler/rustc_ast/src/ptr.rs +++ b/compiler/rustc_ast/src/ptr.rs @@ -126,7 +126,8 @@ impl<S: Encoder, T: Encodable<S>> Encodable<S> for P<T> { } impl<T> P<[T]> { - pub const fn new() -> P<[T]> { + // FIXME(const-hack) make this const again + pub fn new() -> P<[T]> { P { ptr: Box::default() } } |