treewide: Remove option_result_contains feature

Per rust-lang/rust#62358, this feature has
been removed. To prepare for a future nightly toolchain bump, this
replaces all the places we're using Option::contains with
`iter().any(...)`.

Change-Id: Idd507bdc9b35415061e3b7b8b37cc98bbb980c77
Reviewed-on: https://gerrit.readyset.name/c/readyset/+/4612
Tested-by: Buildkite CI
Reviewed-by: Dan Wilbanks <[email protected]>

Author: glittershark

readyset-dataflow/src/lib.rs

@@ -9,7 +9,6 @@
     binary_heap_retain,
     trait_alias,
     btree_drain_filter,
-    option_result_contains,
     bound_as_ref,
     bound_map,
     stmt_expr_attributes,

readyset-dataflow/src/ops/paginate.rs

@@ -57,7 +57,9 @@ impl<'op, 'state> PartialEq for CurrentRecord<'op, 'state> {
 
 impl<'op, 'state> PartialEq<[DfValue]> for CurrentRecord<'op, 'state> {
     fn eq(&self, other: &[DfValue]) -> bool {
-        self.partial_cmp(other).contains(&Ordering::Equal)
+        self.partial_cmp(other)
+            .iter()
+            .any(|c| *c == Ordering::Equal)
     }
 }
 

readyset-dataflow/src/ops/topk.rs

@@ -58,7 +58,9 @@ impl<'topk, 'state> PartialEq for CurrentRecord<'topk, 'state> {
 
 impl<'topk, 'state> PartialEq<[DfValue]> for CurrentRecord<'topk, 'state> {
     fn eq(&self, other: &[DfValue]) -> bool {
-        self.partial_cmp(other).contains(&Ordering::Equal)
+        self.partial_cmp(other)
+            .iter()
+            .any(|c| *c == Ordering::Equal)
     }
 }
 

readyset-server/tests/config_backwards_compatibility.rs

@@ -1,5 +1,3 @@
-#![feature(option_result_contains)]
-
 use std::ffi::OsStr;
 
 use include_dir::{include_dir, Dir};
@@ -10,7 +8,12 @@ const CONFIG_VERSIONS: Dir = include_dir!("tests/config_versions");
 #[test]
 fn deserialize_old_versions() {
     for file in CONFIG_VERSIONS.files() {
-        if !file.path().extension().contains(&OsStr::new("json")) {
+        if !file
+            .path()
+            .extension()
+            .iter()
+            .any(|ext| *ext == OsStr::new("json"))
+        {
             continue;
         }