T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Rust 2018 edition (#632)

Browse Source 
* initial cargo fix run

* Upgrade cranelift-entity crate

* Upgrade bforest crate

* Upgrade the codegen crate

* Upgrade the faerie crate

* Upgrade the filetests crate

* Upgrade the codegen-meta crate

* Upgrade the frontend crate

* Upgrade the cranelift-module crate

* Upgrade the cranelift-native crate

* Upgrade the cranelift-preopt crate

* Upgrade the cranelift-reader crate

* Upgrade the cranelift-serde crate

* Upgrade the cranelift-simplejit crate

* Upgrade the cranelift or cranelift-umbrella crate

* Upgrade the cranelift-wasm crate

* Upgrade cranelift-tools crate

* Use new import style on remaining files

* run format-all.sh

* run test-all.sh, update Readme and travis ci configuration
fixed an AssertionError also

* Remove deprecated functions
This commit is contained in:
Muhammad Mominul Huque
2018-12-26 23:49:05 +06:00
committed by Dan Gohman
parent e3db942b0c
commit effe6c04e4
217 changed files with 963 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/codegen/src/verifier/mod.rs
View File

@@ -57,26 +57,27 @@
//! of arguments must match the destination type, and the lane indexes must be in range.
use self::flags::verify_flags;
use dbg::DisplayList;
use dominator_tree::DominatorTree;
use entity::SparseSet;
use flowgraph::{BasicBlock, ControlFlowGraph};
use ir;
use ir::entities::AnyEntity;
use ir::instructions::{BranchInfo, CallInfo, InstructionFormat, ResolvedConstraint};
use ir::{
use crate::dbg::DisplayList;
use crate::dominator_tree::DominatorTree;
use crate::entity::SparseSet;
use crate::flowgraph::{BasicBlock, ControlFlowGraph};
use crate::ir;
use crate::ir::entities::AnyEntity;
use crate::ir::instructions::{BranchInfo, CallInfo, InstructionFormat, ResolvedConstraint};
use crate::ir::{
types, ArgumentLoc, Ebb, FuncRef, Function, GlobalValue, Inst, JumpTable, Opcode, SigRef,
StackSlot, StackSlotKind, Type, Value, ValueDef, ValueList, ValueLoc,
};
use isa::TargetIsa;
use iterators::IteratorExtras;
use settings::FlagsOrIsa;
use crate::isa::TargetIsa;
use crate::iterators::IteratorExtras;
use crate::settings::FlagsOrIsa;
use crate::timing;
use failure_derive::Fail;
use std::cmp::Ordering;
use std::collections::BTreeSet;
use std::fmt::{self, Display, Formatter, Write};
use std::string::String;
use std::vec::Vec;
use timing;
pub use self::cssa::verify_cssa;
pub use self::liveness::verify_liveness;
@@ -90,14 +91,14 @@ pub use self::locations::verify_locations;
/// as the error message.
macro_rules! report {
( $errors: expr, $loc: expr, $msg: tt ) => {
$errors.0.push(::verifier::VerifierError {
$errors.0.push(crate::verifier::VerifierError {
location: $loc.into(),
message: String::from($msg),
})
};
( $errors: expr, $loc: expr, $fmt: tt, $( $arg: expr ),+ ) => {
$errors.0.push(::verifier::VerifierError {
$errors.0.push(crate::verifier::VerifierError {
location: $loc.into(),
message: format!( $fmt, $( $arg ),+ ),
})
@@ -551,7 +552,7 @@ impl<'a> Verifier<'a> {
inst: Inst,
errors: &mut VerifierErrors,
) -> VerifierStepResult<()> {
use ir::instructions::InstructionData::*;
use crate::ir::instructions::InstructionData::*;
for &arg in self.func.dfg.inst_args(inst) {
self.verify_inst_arg(inst, arg, errors)?;
@@ -1699,10 +1700,10 @@ impl<'a> Verifier<'a> {
#[cfg(test)]
mod tests {
use super::{Verifier, VerifierError, VerifierErrors};
use entity::EntityList;
use ir::instructions::{InstructionData, Opcode};
use ir::Function;
use settings;
use crate::entity::EntityList;
use crate::ir::instructions::{InstructionData, Opcode};
use crate::ir::Function;
use crate::settings;
macro_rules! assert_err_with_msg {
($e:expr, $msg:expr) => {