diff options
| author | bors <bors@rust-lang.org> | 2024-10-13 03:59:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-13 03:59:00 +0000 |
| commit | ecf2d1fa4bd8166c696883b10f483122b1fe98a3 (patch) | |
| tree | 18c963c7b385d49172e31bf764ced45026b90feb /library/alloc/src | |
| parent | ef4e8259b5016d85e261587b605028b2ff06c13d (diff) | |
| parent | 39071fdc586adccf18c01e5e3a1faa39bbc00c3a (diff) | |
Auto merge of #131635 - tgross35:rollup-df8il2t, r=tgross35
Rollup of 7 pull requests Successful merges: - #131120 (Stabilize `const_option`) - #131334 (Enable sanitizers for loongarch64-unknown-*) - #131358 (force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment) - #131418 (Use throw intrinsic from stdarch in wasm libunwind) - #131579 (Remap path prefix in the panic message of `tests/ui/meta/revision-bad.rs`) - #131591 (add latest crash tests) - #131626 (remove a couple of redundant String to String conversion) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/lib.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index 72b3dda1c26..50bf385d671 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -111,7 +111,6 @@ #![feature(const_eval_select)] #![feature(const_heap)] #![feature(const_maybe_uninit_write)] -#![feature(const_option)] #![feature(const_pin)] #![feature(const_size_of_val)] #![feature(const_vec_string_slice)] |