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

bugfix to macro template generation: exclude Pos on ident from equality (broken by recent commit)

Browse Source
This commit is contained in:
Chris Fallin
2021-09-10 01:27:09 -07:00
parent 3ed146b782
commit 83672a88cc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cranelift/isle/src/ast.rs
View File

@@ -120,7 +120,7 @@ impl Pattern {
} }
pub fn make_macro_template(&self, macro_args: &[Ident]) -> Pattern { pub fn make_macro_template(&self, macro_args: &[Ident]) -> Pattern {
log::trace!("repplace_macro_args: {:?} with {:?}", self, macro_args); log::trace!("make_macro_template: {:?} with {:?}", self, macro_args);
match self { match self {
&Pattern::BindPattern { &Pattern::BindPattern {
ref var, ref var,
@@ -128,7 +128,7 @@ impl Pattern {
pos, pos,
.. ..
} if matches!(&**subpat, &Pattern::Wildcard { .. }) => { } if matches!(&**subpat, &Pattern::Wildcard { .. }) => {
if let Some(i) = macro_args.iter().position(|arg| arg == var) { if let Some(i) = macro_args.iter().position(|arg| arg.0 == var.0) {
Pattern::MacroArg { index: i, pos } Pattern::MacroArg { index: i, pos }
} else { } else {
self.clone() self.clone()
@@ -174,6 +174,7 @@ impl Pattern {
} }
pub fn subst_macro_args(&self, macro_args: &[Pattern]) -> Pattern { pub fn subst_macro_args(&self, macro_args: &[Pattern]) -> Pattern {
log::trace!("subst_macro_args: {:?} with {:?}", self, macro_args);
match self { match self {
&Pattern::BindPattern { &Pattern::BindPattern {
ref var, ref var,