testdata: regenerate with wasm-tools 1.230.0

ydnar · ydnar · commit 2d9deb9e91bc · 2025-05-06T16:24:43.000-06:00
diff --git a/testdata/codegen/issue573.wit.json b/testdata/codegen/issue573.wit.json
@@ -8,6 +8,16 @@
             "id": 0
           }
         },
+        "interface-1": {
+          "interface": {
+            "id": 1
+          }
+        },
+        "inline": {
+          "interface": {
+            "id": 3
+          }
+        },
         "t2-renamed": {
           "type": 39
         },
@@ -23,11 +33,6 @@
         "empty": {
           "type": 43
         },
-        "interface-1": {
-          "interface": {
-            "id": 1
-          }
-        },
         "print": {
           "function": {
             "name": "print",
@@ -43,11 +48,6 @@
               }
             ]
           }
-        },
-        "inline": {
-          "interface": {
-            "id": 3
-          }
         }
       },
       "exports": {
diff --git a/testdata/codegen/issue573.wit.json.golden.wit b/testdata/codegen/issue573.wit.json.golden.wit
@@ -85,6 +85,12 @@ interface api {
 
 world types-example {
 	import types-interface;
+	import api-imports;
+	/// Comment for import inline
+	import inline: interface {
+		/// Comment for import inline function
+		inline-imp: func(args: list<option<char>>) -> result<_, char>;
+	}
 	use types-interface.{t2 as t2-renamed};
 	use types-interface.{t10};
 	use types-interface.{permissions};
@@ -98,13 +104,7 @@ world types-example {
 	/// NB: this record used to be empty, but that's no longer valid, so now it's
 	/// non-empty. Don't want to delete the whole test however.
 	record empty { not-empty-anymore: bool }
-	import api-imports;
 	import print: func(message: string, level: log-level);
-	/// Comment for import inline
-	import inline: interface {
-		/// Comment for import inline function
-		inline-imp: func(args: list<option<char>>) -> result<_, char>;
-	}
 	export f-f1: func(typedef: t10) -> t10;
 	export f1: func(f: f32, f-list: list<tuple<char, f64>>) -> tuple<s64, string>;
 	/// t2 has been renamed with `use self.types-interface.{t2 as t2-renamed}`
diff --git a/testdata/codegen/lift-lower-foreign.wit.json b/testdata/codegen/lift-lower-foreign.wit.json
@@ -8,6 +8,11 @@
             "id": 0
           }
         },
+        "interface-1": {
+          "interface": {
+            "id": 1
+          }
+        },
         "u1": {
           "type": 20
         },
@@ -37,11 +42,6 @@
         },
         "u11": {
           "type": 29
-        },
-        "interface-1": {
-          "interface": {
-            "id": 1
-          }
         }
       },
       "exports": {
diff --git a/testdata/codegen/lift-lower-foreign.wit.json.golden.wit b/testdata/codegen/lift-lower-foreign.wit.json.golden.wit
@@ -38,6 +38,7 @@ interface the-interface {
 
 world foo {
 	import a;
+	import the-interface;
 	use a.{t1 as u1};
 	use a.{t2 as u2};
 	use a.{t3 as u3};
@@ -48,7 +49,6 @@ world foo {
 	use a.{t8 as %u8};
 	use a.{t10 as u10};
 	use a.{t11 as u11};
-	import the-interface;
 	export foo-f1: func(a: u1) -> u1;
 	export foo-f2: func(a: u2) -> u2;
 	export foo-f3: func(a: u3) -> u3;
diff --git a/testdata/codegen/resources.wit.json b/testdata/codegen/resources.wit.json
@@ -3,6 +3,11 @@
     {
       "name": "resources",
       "imports": {
+        "imports": {
+          "interface": {
+            "id": 2
+          }
+        },
         "interface-0": {
           "interface": {
             "id": 0
@@ -16,11 +21,6 @@
         },
         "big": {
           "type": 4
-        },
-        "imports": {
-          "interface": {
-            "id": 2
-          }
         }
       },
       "exports": {
diff --git a/testdata/codegen/resources.wit.json.golden.wit b/testdata/codegen/resources.wit.json.golden.wit
@@ -7,6 +7,14 @@ interface types {
 }
 
 world resources {
+	import imports: interface {
+		resource y {
+			constructor(a: f64);
+			get-a: func() -> f64;
+			set-a: func(a: f64);
+			add: static func(y: y, a: f64) -> y;
+		}
+	}
 	import types;
 	use types.{z};
 	variant includes-borrow { a, b(borrow<z>) }
@@ -22,14 +30,6 @@ world resources {
 		x9: borrow<z>,
 		x10: borrow<z>,
 	}
-	import imports: interface {
-		resource y {
-			constructor(a: f64);
-			get-a: func() -> f64;
-			set-a: func(a: f64);
-			add: static func(y: y, a: f64) -> y;
-		}
-	}
 	export add: func(a: borrow<z>, b: borrow<z>) -> z;
 	export maybe-with-z: func(a: option<borrow<z>>);
 	export variant-with-z: func(a: includes-borrow);
diff --git a/testdata/issues/issue306.wit.json b/testdata/issues/issue306.wit.json
@@ -22,12 +22,7 @@
       "imports": {
         "interface-0": {
           "interface": {
-            "id": 0,
-            "stability": {
-              "stable": {
-                "since": "0.2.0"
-              }
-            }
+            "id": 0
           }
         }
       },
diff --git a/testdata/issues/issue325.wit.json b/testdata/issues/issue325.wit.json
@@ -22,12 +22,7 @@
       "imports": {
         "interface-0": {
           "interface": {
-            "id": 0,
-            "stability": {
-              "stable": {
-                "since": "0.2.0"
-              }
-            }
+            "id": 0
           }
         }
       },
@@ -61,8 +56,8 @@
           "interface": {
             "id": 0,
             "stability": {
-              "stable": {
-                "since": "0.2.0"
+              "unstable": {
+                "feature": "active"
               }
             }
           }
diff --git a/testdata/issues/issue325.wit.json.golden.wit b/testdata/issues/issue325.wit.json.golden.wit
@@ -1,6 +1,7 @@
 package issues:issue325;
 
 world w {
+	@unstable(feature = active)
 	import issues:dep2/i@0.2.0;
 	@unstable(feature = active)
 	use issues:dep2/i@0.2.0.{r};
diff --git a/testdata/wit-parser/gated-include-use-with-stable.wit.json b/testdata/wit-parser/gated-include-use-with-stable.wit.json
@@ -61,12 +61,7 @@
       "imports": {
         "interface-2": {
           "interface": {
-            "id": 2,
-            "stability": {
-              "stable": {
-                "since": "0.2.0"
-              }
-            }
+            "id": 2
           }
         },
         "interface-1": {
@@ -106,9 +101,6 @@
             }
           }
         },
-        "stable-resource": {
-          "type": 3
-        },
         "interface-1": {
           "interface": {
             "id": 1,
@@ -119,9 +111,6 @@
             }
           }
         },
-        "unversioned-resource": {
-          "type": 4
-        },
         "interface-0": {
           "interface": {
             "id": 0,
@@ -132,6 +121,12 @@
             }
           }
         },
+        "stable-resource": {
+          "type": 3
+        },
+        "unversioned-resource": {
+          "type": 4
+        },
         "unstable-resource": {
           "type": 5
         }
@@ -151,15 +146,12 @@
           "interface": {
             "id": 2,
             "stability": {
-              "stable": {
-                "since": "0.2.0"
+              "unstable": {
+                "feature": "active"
               }
             }
           }
         },
-        "stable-resource": {
-          "type": 3
-        },
         "interface-1": {
           "interface": {
             "id": 1,
@@ -170,9 +162,6 @@
             }
           }
         },
-        "unversioned-resource": {
-          "type": 4
-        },
         "interface-0": {
           "interface": {
             "id": 0,
@@ -183,6 +172,12 @@
             }
           }
         },
+        "stable-resource": {
+          "type": 3
+        },
+        "unversioned-resource": {
+          "type": 4
+        },
         "unstable-resource": {
           "type": 5
         }
@@ -197,8 +192,8 @@
           "interface": {
             "id": 2,
             "stability": {
-              "stable": {
-                "since": "0.2.0"
+              "unstable": {
+                "feature": "active"
               }
             }
           }
diff --git a/testdata/wit-parser/gated-include-use-with-stable.wit.json.golden.wit b/testdata/wit-parser/gated-include-use-with-stable.wit.json.golden.wit
@@ -1,20 +1,22 @@
 package wasmtime:test;
 
 world test {
-	import wasi:dep2/stable@0.2.3;
 	@unstable(feature = active)
-	use wasi:dep2/stable@0.2.3.{stable-resource};
+	import wasi:dep2/stable@0.2.3;
 	@unstable(feature = active)
 	import wasi:dep-unversioned/unversioned;
 	@unstable(feature = active)
-	use wasi:dep-unversioned/unversioned.{unversioned-resource};
-	@unstable(feature = active)
 	import wasi:dep-unstable/unstable;
 	@unstable(feature = active)
+	use wasi:dep2/stable@0.2.3.{stable-resource};
+	@unstable(feature = active)
+	use wasi:dep-unversioned/unversioned.{unversioned-resource};
+	@unstable(feature = active)
 	use wasi:dep-unstable/unstable.{unstable-resource};
 }
 
 world test-ordered {
+	@unstable(feature = active)
 	import wasi:dep2/stable@0.2.3;
 	@unstable(feature = active)
 	import wasi:dep-unversioned/unversioned;
@@ -44,14 +46,14 @@ package wasi:unstable@0.2.3 {
 		@unstable(feature = active)
 		import wasi:dep2/stable@0.2.3;
 		@unstable(feature = active)
-		use wasi:dep2/stable@0.2.3.{stable-resource};
-		@unstable(feature = active)
 		import wasi:dep-unversioned/unversioned;
 		@unstable(feature = active)
-		use wasi:dep-unversioned/unversioned.{unversioned-resource};
-		@unstable(feature = active)
 		import wasi:dep-unstable/unstable;
 		@unstable(feature = active)
+		use wasi:dep2/stable@0.2.3.{stable-resource};
+		@unstable(feature = active)
+		use wasi:dep-unversioned/unversioned.{unversioned-resource};
+		@unstable(feature = active)
 		use wasi:dep-unstable/unstable.{unstable-resource};
 	}
 }
diff --git a/testdata/wit-parser/since-and-unstable.wit.json b/testdata/wit-parser/since-and-unstable.wit.json
diff --git a/testdata/wit-parser/since-and-unstable.wit.json.golden.wit b/testdata/wit-parser/since-and-unstable.wit.json.golden.wit

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,7 @@`
`22`	`22`	`"imports": {`
`23`	`23`	`"interface-0": {`
`24`	`24`	`"interface": {`
`25`		`- "id": 0,`
`26`		`- "stability": {`
`27`		`- "stable": {`
`28`		`- "since": "0.2.0"`
`29`		`- }`
`30`		`- }`
	`25`	`+ "id": 0`
`31`	`26`	`}`
`32`	`27`	`}`
`33`	`28`	`},`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,7 @@`
`61`	`61`	`"imports": {`
`62`	`62`	`"interface-2": {`
`63`	`63`	`"interface": {`
`64`		`- "id": 2,`
`65`		`- "stability": {`
`66`		`- "stable": {`
`67`		`- "since": "0.2.0"`
`68`		`- }`
`69`		`- }`
	`64`	`+ "id": 2`
`70`	`65`	`}`
`71`	`66`	`},`
`72`	`67`	`"interface-1": {`
`@@ -106,9 +101,6 @@`
`106`	`101`	`}`
`107`	`102`	`}`
`108`	`103`	`},`
`109`		`- "stable-resource": {`
`110`		`- "type": 3`
`111`		`- },`
`112`	`104`	`"interface-1": {`
`113`	`105`	`"interface": {`
`114`	`106`	`"id": 1,`
`@@ -119,9 +111,6 @@`
`119`	`111`	`}`
`120`	`112`	`}`
`121`	`113`	`},`
`122`		`- "unversioned-resource": {`
`123`		`- "type": 4`
`124`		`- },`
`125`	`114`	`"interface-0": {`
`126`	`115`	`"interface": {`
`127`	`116`	`"id": 0,`
`@@ -132,6 +121,12 @@`
`132`	`121`	`}`
`133`	`122`	`}`
`134`	`123`	`},`
	`124`	`+ "stable-resource": {`
	`125`	`+ "type": 3`
	`126`	`+ },`
	`127`	`+ "unversioned-resource": {`
	`128`	`+ "type": 4`
	`129`	`+ },`
`135`	`130`	`"unstable-resource": {`
`136`	`131`	`"type": 5`
`137`	`132`	`}`
`@@ -151,15 +146,12 @@`
`151`	`146`	`"interface": {`
`152`	`147`	`"id": 2,`
`153`	`148`	`"stability": {`
`154`		`- "stable": {`
`155`		`- "since": "0.2.0"`
	`149`	`+ "unstable": {`
	`150`	`+ "feature": "active"`
`156`	`151`	`}`
`157`	`152`	`}`
`158`	`153`	`}`
`159`	`154`	`},`
`160`		`- "stable-resource": {`
`161`		`- "type": 3`
`162`		`- },`
`163`	`155`	`"interface-1": {`
`164`	`156`	`"interface": {`
`165`	`157`	`"id": 1,`
`@@ -170,9 +162,6 @@`
`170`	`162`	`}`
`171`	`163`	`}`
`172`	`164`	`},`
`173`		`- "unversioned-resource": {`
`174`		`- "type": 4`
`175`		`- },`
`176`	`165`	`"interface-0": {`
`177`	`166`	`"interface": {`
`178`	`167`	`"id": 0,`
`@@ -183,6 +172,12 @@`
`183`	`172`	`}`
`184`	`173`	`}`
`185`	`174`	`},`
	`175`	`+ "stable-resource": {`
	`176`	`+ "type": 3`
	`177`	`+ },`
	`178`	`+ "unversioned-resource": {`
	`179`	`+ "type": 4`
	`180`	`+ },`
`186`	`181`	`"unstable-resource": {`
`187`	`182`	`"type": 5`
`188`	`183`	`}`
`@@ -197,8 +192,8 @@`
`197`	`192`	`"interface": {`
`198`	`193`	`"id": 2,`
`199`	`194`	`"stability": {`
`200`		`- "stable": {`
`201`		`- "since": "0.2.0"`
	`195`	`+ "unstable": {`
	`196`	`+ "feature": "active"`
`202`	`197`	`}`
`203`	`198`	`}`
`204`	`199`	`}`