From 45e2130900246bd41661e9616ffebab54f54e133 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Wed, 19 Feb 2020 10:37:58 -0800
Subject: [PATCH] Remove special casing for old spec test error messages

---
 src/operators_validator.rs |  4 ++--
 src/tests.rs               | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/operators_validator.rs b/src/operators_validator.rs
index 5a0d985c..0c200e5c 100644
--- a/src/operators_validator.rs
+++ b/src/operators_validator.rs
@@ -1992,7 +1992,7 @@ impl OperatorValidator {
                 }
                 if segment >= resources.element_count() {
                     bail_op_err!(
-                        "unknown element segment {}: segment index out of bounds",
+                        "unknown elem segment {}: segment index out of bounds",
                         segment
                     );
                 }
@@ -2003,7 +2003,7 @@ impl OperatorValidator {
                 self.check_bulk_memory_enabled()?;
                 if segment >= resources.element_count() {
                     bail_op_err!(
-                        "unknown element segment {}: segment index out of bounds",
+                        "unknown elem segment {}: segment index out of bounds",
                         segment
                     );
                 }
diff --git a/src/tests.rs b/src/tests.rs
index dbeba5a8..d50778ae 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -439,16 +439,6 @@ mod wast_tests {
                         );
                     }
                     Err(e) => {
-                        if message.contains("unknown table")
-                            && e.message().contains("unknown element segment")
-                        {
-                            println!(
-                                "{}:{}: skipping until \
-                                 https://github.com/WebAssembly/testsuite/pull/18 is merged",
-                                filename, line,
-                            );
-                            continue;
-                        }
                         assert!(
                             e.message().contains(message),
                             "{file}:{line}: expected \"{spec}\", got \"{actual}\"",