diff options
| author | dependabot[bot] <dependabot[bot]@users.noreply.github.com> | 2018-09-27 17:29:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 17:29:04 +0000 |
| commit | efeb0e739e4ffd9331ec1c222ab8341c094384f9 (patch) | |
| tree | 00301dd237b8a0620a38bdb6b03618fe44441c0c | |
| parent | 742a795c78773d997f5d475c32574536b91b0688 (diff) | |
| parent | 0c42107ea6f63cc1a4d6fcf86d62579a5713aabf (diff) | |
| download | rust-efeb0e739e4ffd9331ec1c222ab8341c094384f9.tar.gz rust-efeb0e739e4ffd9331ec1c222ab8341c094384f9.zip | |
Merge pull request #58 from bjorn3/dependabot/cargo/cranelift-0199e3d
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | src/pretty_clif.rs | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock index b986be61f4c..6d5b3afa336 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ dependencies = [ [[package]] name = "cranelift" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-frontend 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -99,7 +99,7 @@ dependencies = [ [[package]] name = "cranelift-bforest" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", ] @@ -107,7 +107,7 @@ dependencies = [ [[package]] name = "cranelift-codegen" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-bforest 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-codegen-meta 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -121,17 +121,17 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" [[package]] name = "cranelift-entity" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" [[package]] name = "cranelift-faerie" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "cranelift-frontend" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -154,7 +154,7 @@ dependencies = [ [[package]] name = "cranelift-module" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-entity 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "cranelift-native" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "raw-cpuid 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "cranelift-simplejit" version = "0.22.0" -source = "git+https://github.com/CraneStation/cranelift.git#8a79275d8900266a42a97890ecde5264a9caa295" +source = "git+https://github.com/CraneStation/cranelift.git#0199e3d82845b5a49769b326d0c520a4c7b62901" dependencies = [ "cranelift-codegen 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", "cranelift-module 0.22.0 (git+https://github.com/CraneStation/cranelift.git)", diff --git a/src/pretty_clif.rs b/src/pretty_clif.rs index 08e685841aa..53e0d5cd1ce 100644 --- a/src/pretty_clif.rs +++ b/src/pretty_clif.rs @@ -2,7 +2,7 @@ use std::borrow::Cow; use std::collections::HashMap; use std::fmt; -use cranelift::codegen::entity::EntityMap; +use cranelift::codegen::entity::SecondaryMap; use cranelift::codegen::write::{FuncWriter, PlainWriter}; use crate::prelude::*; @@ -14,7 +14,7 @@ impl FuncWriter for CommentWriter { &mut self, w: &mut dyn fmt::Write, func: &Function, - aliases: &EntityMap<Value, Vec<Value>>, + aliases: &SecondaryMap<Value, Vec<Value>>, isa: Option<&dyn isa::TargetIsa>, inst: Inst, indent: usize, |