Rollup merge of #100604 - dtolnay:okorerr, r=m-ou-se

Remove unstable Result::into_ok_or_err Pending FCP: rust-lang/rust#82223 (comment) ```@rustbot``` label +waiting-on-fcp
rust-lang · Aug 26, 2022 · 5b1229e · 5b1229e
2 parents 928ef37 + f21a300
commit 5b1229e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/patches/0024-core-Disable-portable-simd-test.patch b/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)]