Merge branch 'master' into master

This commit is contained in:
Dan Gohman
2018-09-25 16:12:26 -07:00
committed by GitHub
17 changed files with 731 additions and 125 deletions

View File

@@ -165,19 +165,18 @@ fn valid_valuedata(data: &ValueData) -> bool {
return false;
}
}
return true;
true
}
impl<'a> Iterator for Values<'a> {
type Item = Value;
fn next(&mut self) -> Option<Self::Item> {
return self
.inner
self.inner
.by_ref()
.filter(|kv| valid_valuedata(kv.1))
.next()
.map(|kv| kv.0);
.map(|kv| kv.0)
}
}

View File

@@ -6,7 +6,6 @@ use isa;
use isa::constraints::*;
use isa::enc_tables::*;
use isa::encoding::RecipeSizing;
use predicates;
// Include the generated encoding tables:
// - `LEVEL1_RV32`

View File

@@ -10,7 +10,6 @@ use isa;
use isa::constraints::*;
use isa::enc_tables::*;
use isa::encoding::RecipeSizing;
use predicates;
include!(concat!(env!("OUT_DIR"), "/encoding-x86.rs"));
include!(concat!(env!("OUT_DIR"), "/legalize-x86.rs"));