4 files changed, 9 insertions, 13 deletions
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index 464862159..7f0b6043f 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -4391,8 +4391,8 @@ module loaded from binary form:
 )
 
 [wasm-validator error in function func] local.set's value type must be correct, on 
-[none] (local.set $0
- [i64] (i64.const 1234)
+(local.set $0
+ (i64.const 1234)
 )
 validation: 0
 test_parsing text:
diff --git a/test/binaryen.js/validation_errors.js.txt b/test/binaryen.js/validation_errors.js.txt
index 19b772e98..9e4bb1a75 100644
--- a/test/binaryen.js/validation_errors.js.txt
+++ b/test/binaryen.js/validation_errors.js.txt
@@ -1,6 +1,6 @@
 [wasm-validator error in function test] unexpected false: global.get name must be valid, on 
-[i32] (global.get $missing)
+(global.get $missing)
 0
 [wasm-validator error in function test] unexpected false: local.get index must be small enough, on 
-[i32] (local.get $0)
+(local.get $0)
 0
diff --git a/test/example/module-splitting.cpp b/test/example/module-splitting.cpp
index bba0bf0a7..ad0da84a8 100644
--- a/test/example/module-splitting.cpp
+++ b/test/example/module-splitting.cpp
@@ -4,7 +4,6 @@
 #include "ir/module-splitting.h"
 #include "ir/stack-utils.h"
 #include "wasm-features.h"
-#include "wasm-printing.h"
 #include "wasm-s-parser.h"
 #include "wasm-validator.h"
 #include "wasm.h"
@@ -34,7 +33,7 @@ void do_test(const std::set<Name>& keptFuncs, std::string&& module) {
   assert(valid && "before invalid!");
 
   std::cout << "Before:\n";
-  WasmPrinter::printModule(primary.get());
+  std::cout << *primary.get();
 
   std::cout << "Keeping: ";
   if (keptFuncs.size()) {
@@ -54,9 +53,9 @@ void do_test(const std::set<Name>& keptFuncs, std::string&& module) {
   auto secondary = splitFunctions(*primary, config);
 
   std::cout << "After:\n";
-  WasmPrinter::printModule(primary.get());
+  std::cout << *primary.get();
   std::cout << "Secondary:\n";
-  WasmPrinter::printModule(secondary.get());
+  std::cout << *secondary.get();
   std::cout << "\n\n";
 
   valid = validator.validate(*primary);
diff --git a/test/example/stack-utils.cpp b/test/example/stack-utils.cpp
index 9f20b8c2a..96bc6fb85 100644
--- a/test/example/stack-utils.cpp
+++ b/test/example/stack-utils.cpp
@@ -5,7 +5,6 @@
 #include "literal.h"
 #include "mixed_arena.h"
 #include "wasm-builder.h"
-#include "wasm-printing.h"
 #include "wasm-type.h"
 #include "wasm.h"
 
@@ -26,11 +25,9 @@ void test_remove_nops() {
       builder.makeNop(),
     },
     {Type::i32, Type::i64});
-  WasmPrinter::printExpression(block, std::cout);
-  std::cout << "\n";
+  std::cout << *block << '\n';
   StackUtils::removeNops(block);
-  WasmPrinter::printExpression(block, std::cout);
-  std::cout << "\n";
+  std::cout << *block << '\n';
 }
 
 void test_stack_signatures() {