Make `assert_instr` stricter

1 files changed, 3 insertions, 3 deletions

diff --git a/library/stdarch/crates/stdarch-test/src/disassembly.rs b/library/stdarch/crates/stdarch-test/src/disassembly.rs
index a7b46a73fc3..6a3ca06cb6f 100644
--- a/library/stdarch/crates/stdarch-test/src/disassembly.rs
+++ b/library/stdarch/crates/stdarch-test/src/disassembly.rs
@@ -140,7 +140,7 @@ fn parse(output: &str) -> HashSet<Function> {
                     .filter(|&x| !x.is_empty())
                     .skip(1)
                     .map(str::to_lowercase)
-                    .skip_while(|s| *s == "lock") // skip x86-specific prefix
+                    .skip_while(|s| matches!(&**s, "lock" | "vex")) // skip x86-specific prefix
                     .collect::<Vec<String>>()
             } else {
                 // objdump with --no-show-raw-insn
@@ -150,8 +150,8 @@ fn parse(output: &str) -> HashSet<Function> {
                 instruction
                     .split_whitespace()
                     .skip(1)
-                    .skip_while(|s| *s == "lock" || *s == "{evex}") // skip x86-specific prefix
-                    .map(std::string::ToString::to_string)
+                    .skip_while(|s| matches!(*s, "lock" | "{evex}" | "{vex}")) // skip x86-specific prefix
+                    .map(ToString::to_string)
                     .collect::<Vec<String>>()
             };