Fix compilation with Rust 1.51+

Fixes #16.

Cargo.toml

@@ -19,6 +19,7 @@ reduce = "0.1"
 cpp_demangle = "0.2"
 rustc-demangle = "0.1"
 log = "0.4.8"
+rustversion = "1.0"
 
 [dev-dependencies]
 env_logger = "0.7.1"

src/cell_memory.rs

@@ -7,10 +7,15 @@ use crate::error::*;
 use crate::solver_utils::bvs_can_be_equal;
 use boolector::Btor;
 use log::debug;
-use reduce::Reduce;
 use std::convert::TryInto;
 use std::rc::Rc;
 
+// Rust 1.51.0 introduced its own `.reduce()` on the main `Iterator` trait.
+// So, starting with 1.51.0, we don't need `reduce::Reduce`, and in fact it
+// causes a conflict.
+#[rustversion::before(1.51)]
+use reduce::Reduce;
+
 type BV = boolector::BV<Rc<Btor>>;
 type Array = boolector::Array<Rc<Btor>>;
 

src/hook_utils.rs

@@ -8,9 +8,14 @@ use crate::solver_utils::PossibleSolutions;
 use crate::state::State;
 use llvm_ir::Operand;
 use log::{debug, info, warn};
-use reduce::Reduce;
 use std::convert::{TryFrom, TryInto};
 
+// Rust 1.51.0 introduced its own `.reduce()` on the main `Iterator` trait.
+// So, starting with 1.51.0, we don't need `reduce::Reduce`, and in fact it
+// causes a conflict.
+#[rustversion::before(1.51)]
+use reduce::Reduce;
+
 /// Set `num_bytes` bytes of memory at address `addr` each to the value `val`.
 /// Each individual byte will be set to `val`, so only the lowest 8 bits of `val`
 /// will be used.

src/simple_memory.rs

@@ -10,9 +10,14 @@ use crate::error::*;
 use crate::solver_utils::bvs_can_be_equal;
 use boolector::Btor;
 use log::debug;
-use reduce::Reduce;
 use std::rc::Rc;
 
+// Rust 1.51.0 introduced its own `.reduce()` on the main `Iterator` trait.
+// So, starting with 1.51.0, we don't need `reduce::Reduce`, and in fact it
+// causes a conflict.
+#[rustversion::before(1.51)]
+use reduce::Reduce;
+
 type BV = boolector::BV<Rc<Btor>>;
 type Array = boolector::Array<Rc<Btor>>;
 

src/state.rs

@@ -5,14 +5,19 @@ use itertools::Itertools;
 use llvm_ir::types::{FPType, NamedStructDef, Typed};
 use llvm_ir::*;
 use log::{debug, info, warn};
-use reduce::Reduce;
 use std::cell::RefCell;
 use std::collections::{HashMap, HashSet};
 use std::convert::TryInto;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::ops::Deref;
 
+// Rust 1.51.0 introduced its own `.reduce()` on the main `Iterator` trait.
+// So, starting with 1.51.0, we don't need `reduce::Reduce`, and in fact it
+// causes a conflict.
+#[rustversion::before(1.51)]
+use reduce::Reduce;
+
 use crate::alloc::Alloc;
 use crate::backend::*;
 use crate::config::{Config, NullPointerChecking};

src/symex.rs

@@ -4,10 +4,15 @@ use llvm_ir::instruction::{BinaryOp, InlineAssembly};
 use llvm_ir::types::NamedStructDef;
 use llvm_ir::*;
 use log::{debug, info};
-use reduce::Reduce;
 use std::convert::TryInto;
 use std::fmt;
 
+// Rust 1.51.0 introduced its own `.reduce()` on the main `Iterator` trait.
+// So, starting with 1.51.0, we don't need `reduce::Reduce`, and in fact it
+// causes a conflict.
+#[rustversion::before(1.51)]
+use reduce::Reduce;
+
 use crate::backend::*;
 use crate::config::*;
 use crate::error::*;