Browse Source

Cleaned up improper merge. Builds correctly now.

master
Cameron Weinfurt 3 years ago
parent
commit
2f113196b6
  1. 20
      src/clause.rs

20
src/clause.rs

@ -267,18 +267,24 @@ impl core::ops::IndexMut<usize> for Clause {
impl Display for Clause {
fn fmt(&self, fmt: &mut Formatter) -> core::fmt::Result {
if self.literals.len() == 0 {
#[cfg(not(no_unicode))]
{
#[cfg(not(no_unicode))] {
write!(fmt, "⊥")?;
}
#[cfg(no_unicode)]
{
write!(fmt, "FALSE")?;
}
#[cfg(not(no_unicode))]
write!(fmt, " ∨ {}", lit)?;
#[cfg(no_unicode)]
write!(fmt, " v {}", lit)?;
} else {
let mut iter = self.literals.iter();
write!(fmt, "{}", iter.next().unwrap())?;
for lit in iter {
#[cfg(not(no_unicode))] {
write!(fmt, " ∨ {}", lit)?;
}
#[cfg(no_unicode)] {
write!(fmt, " v {}", lit)?;
}
}
}
Ok(())
}
@ -386,7 +392,7 @@ impl core::ops::IndexMut<usize> for ClauseList {
impl Display for ClauseList {
fn fmt(&self, fmt: &mut Formatter) -> core::fmt::Result {
for clause in self.iter() {
write!(fmt, "{}\n", clause);
write!(fmt, "{}\n", clause)?;
}
Ok(())
}

Loading…
Cancel
Save