about summary refs log tree commit diff
path: root/compiler/rustc_codegen_gcc
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2022-08-26 09:51:44 +0900
committerGitHub <noreply@github.com>2022-08-26 09:51:44 +0900
commitba31a9b5059d93bcd6b2a0472fec769f0ab16ef5 (patch)
treea198b69f96341b2e0704ca9bf7c089bad4a65343 /compiler/rustc_codegen_gcc
parente193f4697f11aed89329177d04c84bcd9ce1b424 (diff)
parent39809c5f68e5618dc4183cfa95499df70357e617 (diff)
downloadrust-ba31a9b5059d93bcd6b2a0472fec769f0ab16ef5.tar.gz
rust-ba31a9b5059d93bcd6b2a0472fec769f0ab16ef5.zip
Rollup merge of #100604 - dtolnay:okorerr, r=m-ou-se
Remove unstable Result::into_ok_or_err

Pending FCP: https://github.com/rust-lang/rust/issues/82223#issuecomment-1214920203

```@rustbot``` label +waiting-on-fcp
Diffstat (limited to 'compiler/rustc_codegen_gcc')
-rw-r--r--compiler/rustc_codegen_gcc/patches/0024-core-Disable-portable-simd-test.patch1
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/patches/0024-core-Disable-portable-simd-test.patch b/compiler/rustc_codegen_gcc/patches/0024-core-Disable-portable-simd-test.patch
index d5fa1cec061..c59a40df039 100644
--- a/compiler/rustc_codegen_gcc/patches/0024-core-Disable-portable-simd-test.patch
+++ b/compiler/rustc_codegen_gcc/patches/0024-core-Disable-portable-simd-test.patch
@@ -14,7 +14,6 @@ index 06c7be0..359e2e7 100644
 @@ -75,7 +75,6 @@
  #![feature(never_type)]
  #![feature(unwrap_infallible)]
- #![feature(result_into_ok_or_err)]
 -#![feature(portable_simd)]
  #![feature(ptr_metadata)]
  #![feature(once_cell)]