From 17a8f05bc61895347640eaa4a5fedc5b86122195 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Fri, 30 Oct 2026 13:20:39 -0700 Subject: [PATCH 1/4] chore(quest): claim quest/m3/ts-zero-sized.md Quest-Claim: 57911bd6ae413a20 From f3c74f0a037530e8df94c07fff168bbf97f0bc63 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Fri, 30 Oct 2026 14:30:56 -0700 Subject: [PATCH 2/4] feat(ts): translate zero-sized values MIR never assigns A zero-sized result or local that nothing assigns, the return place included, is made as a constant of it is, and a constant of std's iterators of zero-sized fields, as `from_fn` of a closure capturing nothing makes, is the call that makes it. A VecDeque reserves at the first item it extends by, as std's does for zero-sized elements. Co-Authored-By: Claude Opus 5.5 --- quest/m3/README.md | 2 +- quest/m3/ts-zero-sized-impls.md | 18 + quest/m3/ts-zero-sized.md | 18 - ts/fixtures/lang/caller.ts | 10 +- ts/fixtures/lang/expected/arrays.ts | 6 +- ts/fixtures/lang/expected/core/option.ts | 8 + ts/fixtures/lang/expected/harness.ts | 3 +- ts/fixtures/lang/expected/hints.Unit.ts | 28 + ts/fixtures/lang/expected/hints.ts | 678 +++++++++++++++++++---- ts/fixtures/lang/expected/iters.ts | 4 +- ts/fixtures/lang/expected/strs.ts | 8 +- ts/fixtures/lang/expected/zeros.Both.ts | 28 + ts/fixtures/lang/expected/zeros.Holds.ts | 12 + ts/fixtures/lang/expected/zeros.Loud.ts | 16 + ts/fixtures/lang/expected/zeros.One.ts | 20 + ts/fixtures/lang/expected/zeros.Pair.ts | 15 + ts/fixtures/lang/expected/zeros.Quiet.ts | 16 + ts/fixtures/lang/expected/zeros.Unit.ts | 24 + ts/fixtures/lang/expected/zeros.ts | 181 ++++++ ts/fixtures/lang/src/harness.rs | 3 +- ts/fixtures/lang/src/hints.rs | 32 +- ts/fixtures/lang/src/lib.rs | 4 +- ts/fixtures/lang/src/zeros.rs | 188 +++++++ ts/runtime/rt/collections.ts | 10 +- ts/runtime/rt/iter.ts | 9 + ts/src/lower/body.rs | 32 ++ ts/src/lower/consts.rs | 4 + ts/src/lower/iter.rs | 72 +++ ts/src/lower/mir/mod.rs | 38 +- ts/src/lower/mir/rvalue.rs | 14 +- 30 files changed, 1319 insertions(+), 182 deletions(-) create mode 100644 quest/m3/ts-zero-sized-impls.md delete mode 100644 quest/m3/ts-zero-sized.md create mode 100644 ts/fixtures/lang/expected/hints.Unit.ts create mode 100644 ts/fixtures/lang/expected/zeros.Both.ts create mode 100644 ts/fixtures/lang/expected/zeros.Holds.ts create mode 100644 ts/fixtures/lang/expected/zeros.Loud.ts create mode 100644 ts/fixtures/lang/expected/zeros.One.ts create mode 100644 ts/fixtures/lang/expected/zeros.Pair.ts create mode 100644 ts/fixtures/lang/expected/zeros.Quiet.ts create mode 100644 ts/fixtures/lang/expected/zeros.Unit.ts create mode 100644 ts/fixtures/lang/expected/zeros.ts create mode 100644 ts/fixtures/lang/src/zeros.rs diff --git a/quest/m3/README.md b/quest/m3/README.md index a42ead5fb..f0b4cff5d 100644 --- a/quest/m3/README.md +++ b/quest/m3/README.md @@ -36,6 +36,6 @@ generic std gap is planned here even when moq never calls it. - [Port the workflow guard to kixelated/quest](/quest/m3/quest-workflow-guard.md) - quest's environment guard parses YAML as this repository's does - [A VecDeque's Debug](/quest/m3/ts-deque-debug.md) - `{:?}` of a `VecDeque` translates, writing std's list - [A parameter read only where lowering leaves nothing](/quest/m3/ts-unread-params.md) - an instance whose lowering drops every read of a parameter marks it unused, so `tsc` accepts it -- [Zero-sized values made out of sight](/quest/m3/ts-zero-sized.md) - unit structs and empty arrays returned, and std adaptors of only zero-sized fields, translate +- [std's impls of its zero-sized types](/quest/m3/ts-zero-sized-impls.md) - `PhantomData`'s derived impls translate, and `()` is a hash or B-tree key - [Array keys a collection holds](/quest/m3/ts-array-keys.md) - collections of `[T; N]` keys type-check - [Zip's next_back in constant time](/quest/m3/ts-zip-back.md) - a reversed zip of random-access iterators skips the longer side's excess at once diff --git a/quest/m3/ts-zero-sized-impls.md b/quest/m3/ts-zero-sized-impls.md new file mode 100644 index 000000000..d096cb8f9 --- /dev/null +++ b/quest/m3/ts-zero-sized-impls.md @@ -0,0 +1,18 @@ +# [S] std's impls of its zero-sized types + +## Goal + +`PhantomData`'s `Debug`, `Default`, `PartialEq`, and the other impls `#[derive]` calls on a +field of it translate, and `()` is a hash or B-tree key and the item of a +`collect::>`, proven by differential tests against native Rust. + +## Plan + +Found by [#304](https://github.com/moq-dev/rust2/pull/304) on 2026-10-30: a struct deriving +`Debug`, `Default`, or `PartialEq` with a `PhantomData` field is refused as an unsupported +call to its impl, and `HashSet<()>`, `BTreeSet<()>`, `HashMap<(), _>`, and collecting +`Option<()>` items refuse `()` as a key, as an ordered value, and as an `Option` whose +`None` is `rt.None`. The crate's own unit structs already translate in each. Each impl +of `PhantomData` reads nothing; its `Debug` writes its type's name, `PhantomData`. + +Public API: the translator's output. diff --git a/quest/m3/ts-zero-sized.md b/quest/m3/ts-zero-sized.md deleted file mode 100644 index 46825ba8c..000000000 --- a/quest/m3/ts-zero-sized.md +++ /dev/null @@ -1,18 +0,0 @@ -# [M] Zero-sized values made out of sight - -## Goal - -rust2-ts translates the zero-sized values MIR never assigns, proven by differential tests -against native Rust: a function or closure returning a unit struct or an empty array, as -`#[derive(Clone)]` of a unit struct and `|_| [0u8; 0]` do, and a std adaptor of only -zero-sized fields, as `iter::from_fn` of a closure capturing nothing is. - -## Plan - -Found by `hints.rs` in the lang fixture. The first emits `return _0` of a return place -`unassigned` skips, which `tsc` rejects, and the second refuses as "constructing -`std::iter::FromFn<..>` from another crate". Once they translate (a closure's `()` result -already does, since [#303](https://github.com/moq-dev/rust2/pull/303)), `hints::reserves` covers a `Vec` of -zero-sized elements, which holds `usize::MAX`, and `hints::hints` a flatten of `[T; 0]`. - -Public API: the translator's output. diff --git a/ts/fixtures/lang/caller.ts b/ts/fixtures/lang/caller.ts index 2a2b622fe..fe9555975 100644 --- a/ts/fixtures/lang/caller.ts +++ b/ts/fixtures/lang/caller.ts @@ -497,8 +497,12 @@ const hints = Array.from({ length: 24 * 8 * 8 * 8 * 2 }, (_, i) => { /** `hints::reserves` of each collection and element type, each shape, length, and limit on what it reads. */ const reservesOp = op("hints::reserves"); -const reserves = Array.from({ length: 13 * 5 * 5 * 4 * 5 }, (_, i) => - Uint8Array.of(reservesOp, i % 65, Math.floor(i / 65) % 5, Math.floor(i / 325) % 4, Math.floor(i / 1300)), +const reserves = Array.from({ length: 13 * 6 * 5 * 4 * 5 }, (_, i) => + Uint8Array.of(reservesOp, i % 78, Math.floor(i / 78) % 5, Math.floor(i / 390) % 4, Math.floor(i / 1560)), ); -export const cases: Uint8Array[] = [...loops, ...durations, ...ints(), ...utf8, ...floats, ...formats, ...parsed, ...singlesCases, ...singlesFormats, ...singlesParsed, ...dyns, ...cells, ...shared, ...locks, ...onces, ...bounds, ...unsafeCells, ...edits, ...subslices, ...consumers, ...closures, ...elements, ...ranges, ...reducers, ...sliceEdits, ...drains, ...iters, ...hinted, ...peekedOthers, ...hints, ...reserves]; +/** `zeros::zeros` of each case, on up to three bytes. */ +const zerosOp = op("zeros::zeros"); +const zeros = Array.from({ length: 7 * 4 }, (_, i) => Uint8Array.of(zerosOp, i % 7, ...Array.from({ length: Math.floor(i / 7) }, (_, b) => b))); + +export const cases: Uint8Array[] = [...loops, ...durations, ...ints(), ...utf8, ...floats, ...formats, ...parsed, ...singlesCases, ...singlesFormats, ...singlesParsed, ...dyns, ...cells, ...shared, ...locks, ...onces, ...bounds, ...unsafeCells, ...edits, ...subslices, ...consumers, ...closures, ...elements, ...ranges, ...reducers, ...sliceEdits, ...drains, ...iters, ...hinted, ...peekedOthers, ...hints, ...reserves, ...zeros]; diff --git a/ts/fixtures/lang/expected/arrays.ts b/ts/fixtures/lang/expected/arrays.ts index 948ba8f01..6b011958f 100644 --- a/ts/fixtures/lang/expected/arrays.ts +++ b/ts/fixtures/lang/expected/arrays.ts @@ -161,9 +161,11 @@ export function asSlices(data: rt.ByteSlice, out: rt.ByteVec): void { rt.sliceCopyFromSlice(all[_93], [op as rt.u32, (((op as rt.u32)) << 20) >>> 0]); rt.sliceSwap(all, 0, 1); } else if (_22 === 5) { - (([] as rt.u16[])).reverse(); + const _108: rt.u16[] = []; + _108.reverse(); rt.byteSliceFill(rt.byteSliceFrom(Uint8Array.of()), op); - rt.byteVecPush(out, rt.u8Add((([] as rt.u16[])).length & 0xff, rt.byteSliceFrom(Uint8Array.of()).length & 0xff)); + const _117: rt.u16[] = []; + rt.byteVecPush(out, rt.u8Add(_117.length & 0xff, rt.byteSliceFrom(Uint8Array.of()).length & 0xff)); } else if (_22 === 6) { written(rt.byteSliceFrom(bytes), wide, op); } else { diff --git a/ts/fixtures/lang/expected/core/option.ts b/ts/fixtures/lang/expected/core/option.ts index a10d9d456..9f4b70e4b 100644 --- a/ts/fixtures/lang/expected/core/option.ts +++ b/ts/fixtures/lang/expected/core/option.ts @@ -18,6 +18,7 @@ import * as Made from "../defaults.Made.ts"; import type * as Shape from "../dyns.Shape.ts"; import * as Named from "../edits.Named.ts"; import type * as Big from "../hints.Big.ts"; +import type * as Unit from "../hints.Unit.ts"; import type * as Quarter from "../iters.Quarter.ts"; import type * as Tilt from "../iters.Tilt.ts"; import { side, order } from "../keys.ts"; @@ -691,6 +692,13 @@ export function mapOr$1cxlmys(self: Big.Big[] | undefined, default_: rt.usize, f return f(self); } +export function mapOr$0r2th8w(self: Unit.Unit[] | undefined, default_: rt.usize, f: (a0: Unit.Unit[]) => rt.usize): rt.usize { + if (self === undefined) { + return default_; + } + return f(self); +} + export function mapOr$1kiffmd(self: rt.u16[] | undefined, default_: rt.u8, f: (a0: rt.u16[]) => rt.u8): rt.u8 { if (self === undefined) { return default_; diff --git a/ts/fixtures/lang/expected/harness.ts b/ts/fixtures/lang/expected/harness.ts index 2fcd0f82c..c4b118f1e 100644 --- a/ts/fixtures/lang/expected/harness.ts +++ b/ts/fixtures/lang/expected/harness.ts @@ -42,6 +42,7 @@ import { statics, cells as statics_cells, onces } from "./statics.ts"; import { strs, slices, edits as strs_edits, parses as strs_parses, iters, drains as strs_drains, hinted } from "./strs.ts"; import { decodes } from "./utf8.ts"; import { wrappers } from "./wrappers.ts"; +import { zeros } from "./zeros.ts"; /** * Each case's name and what it runs. The first byte picks one modulo their count, so a @@ -186,7 +187,7 @@ export function cases(): [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) uninhabited(data67, out68); }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["keys::lent_keys", lentKeys as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["keys::lent_values", lentValues as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::singles", singles as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::formats", singles_formats as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::parses", singles_parses as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["iters::peeked_others", (_2168: rt.u8, data68: rt.ByteSlice, out69: rt.ByteVec): undefined => { peekedOthers(data68, out69); - }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::hints", hints as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::reserves", reserves as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined]]; + }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::hints", hints as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::reserves", reserves as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["zeros::zeros", zeros as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined]]; } /** Run one case. */ diff --git a/ts/fixtures/lang/expected/hints.Unit.ts b/ts/fixtures/lang/expected/hints.Unit.ts new file mode 100644 index 000000000..f150496d0 --- /dev/null +++ b/ts/fixtures/lang/expected/hints.Unit.ts @@ -0,0 +1,28 @@ +// Generated by rust2-ts. Do not edit. + +import * as rt from "./rt.ts"; + +export function clone$Clone(_self: Unit): Unit { + return {}; +} + +export function eq$PartialEq(_self: Unit, _other: Unit): boolean { + return true; +} + +export function partialCmp$PartialOrd(_self: Unit, _other: Unit): rt.Ordering | undefined { + return 0; +} + +export function cmp$Ord(_self: Unit, _other: Unit): rt.Ordering { + return 0; +} + +export function hash$Hash_DefaultHasher(_self: Unit, _state: rt.Hasher): void { +} + +/** Zero-sized, whose derived `clone` assigns nothing. */ +export interface Unit { +} + +//# sourceMappingURL=hints.Unit.ts.map diff --git a/ts/fixtures/lang/expected/hints.ts b/ts/fixtures/lang/expected/hints.ts index a3c8710ce..324f5aef4 100644 --- a/ts/fixtures/lang/expected/hints.ts +++ b/ts/fixtures/lang/expected/hints.ts @@ -3,12 +3,13 @@ import * as rt from "./rt.ts"; import { copy$u64s } from "./lib.ts"; import { thenSome$1ugl8af } from "./core/bool.ts"; -import { unwrapOr$0r2bmpr, unwrapOr$1rbuegs, mapOr$1cxlmys, mapOr$1umcrqz, mapOr$0pdoq6p, mapOr$0amk6zv, mapOr$08xwngs } from "./core/option.ts"; +import { unwrapOr$0r2bmpr, unwrapOr$1rbuegs, mapOr$1cxlmys, mapOr$0r2th8w, mapOr$1umcrqz, mapOr$0pdoq6p, mapOr$0amk6zv, mapOr$08xwngs } from "./core/option.ts"; import { unwrapOr$0u9zzk3 } from "./core/result.ts"; import * as Big from "./hints.Big.ts"; import * as Countdown from "./hints.Countdown.ts"; import * as Endless from "./hints.Endless.ts"; import type * as Most from "./hints.Most.ts"; +import * as Unit from "./hints.Unit.ts"; /** A hint, as four bytes each, the upper bound after whether it has one. */ export function put(out: rt.ByteVec, _2: [rt.usize, rt.usize | undefined]): void { @@ -48,7 +49,7 @@ export function walk$Bytes(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): v * `it`'s hint, and again after each of up to three items, read from the back where * `steps` has the item's bit set. */ -export function walk$Chain_Flatten_Map_Range_u64_hints_closure25_Range_u64(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walk$Chain_Flatten_Map_Range_u64_hints_closure28_Range_u64(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { let _12!: rt.u8; put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); @@ -370,7 +371,7 @@ export function walk$Filter_Range_u64_hints_closure1(it: rt.Iter, steps: * `it`'s hint, and again after each of up to three items, read from the back where * `steps` has the item's bit set. */ -export function walk$FlatMap_Range_u64_Filter_IntoIter_u64_hints_closure15_closure0_hints_closure15(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walk$FlatMap_Range_u64_Filter_IntoIter_u64_hints_closure17_closure0_hints_closure17(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { let _12!: rt.u8; put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); @@ -390,7 +391,7 @@ export function walk$FlatMap_Range_u64_Filter_IntoIter_u64_hints_closure15_closu * `it`'s hint, and again after each of up to three items, read from the back where * `steps` has the item's bit set. */ -export function walk$FlatMap_Range_u64_Flatten_IntoIter_u64s_hints_closure12(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walk$FlatMap_Range_u64_Flatten_IntoIter_u64s_hints_closure14(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { let _12!: rt.u8; put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); @@ -430,7 +431,7 @@ export function walk$FlatMap_Range_u64_Once_u64_once(it: rt.Iter, steps: * `it`'s hint, and again after each of up to three items, read from the back where * `steps` has the item's bit set. */ -export function walk$FlatMap_Range_u64_Option_u64_hints_closure14(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walk$FlatMap_Range_u64_Option_u64_hints_closure16(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { let _12!: rt.u8; put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); @@ -510,7 +511,7 @@ export function walk$Flatten_Iter_u8s(it: rt.Iter, steps: rt.u8, out: rt. * `it`'s hint, and again after each of up to three items, read from the back where * `steps` has the item's bit set. */ -export function walk$Flatten_Map_Iter_u8_hints_closure16(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walk$Flatten_Map_Iter_u8_hints_closure18(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { let _12!: rt.u8; put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); @@ -550,7 +551,27 @@ export function walk$Flatten_Map_Range_u64_hints_closure11(it: rt.Iter, * `it`'s hint, and again after each of up to three items, read from the back where * `steps` has the item's bit set. */ -export function walk$Flatten_Map_Range_u64_hints_closure13(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walk$Flatten_Map_Range_u64_hints_closure12(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { + let _12!: rt.u8; + put(out, it.sizeHint()); + const _9: rt.u8 = rt.u8Rem(steps, 4); + let iterStart: rt.u8 = 0; + const iterEnd: rt.u8 = _9; + while ((_12 = iterStart++) < iterEnd) { + if ((rt.u8Shr(steps, rt.u8Add(2, _12)) & 1) === 0) { + rt.iterToOption(it.next()); + } else { + rt.iterToOption(it.nextBack()); + } + put(out, it.sizeHint()); + } +} + +/** + * `it`'s hint, and again after each of up to three items, read from the back where + * `steps` has the item's bit set. + */ +export function walk$Flatten_Map_Range_u64_hints_closure15(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { let _12!: rt.u8; put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); @@ -1287,7 +1308,7 @@ export function walk$Zip_Iter_u8_Skip_Iter_u8(it: rt.Iter<[rt.u8, rt.u8]>, steps } /** As `walk`, of an iterator that reads only from the front. */ -export function walkFront$Chain_Map_Zip_Range_u64_Range_u64_hints_closure27_Once_u64(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walkFront$Chain_Map_Zip_Range_u64_Range_u64_hints_closure30_Once_u64(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); let iterStart: rt.u8 = 0; @@ -1347,7 +1368,19 @@ export function walkFront$Filter_Endless_hints_closure6(it: rt.Iter, ste } /** As `walk`, of an iterator that reads only from the front. */ -export function walkFront$FromFn_hints_closure20(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walkFront$FromFn_hints_closure20(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { + put(out, it.sizeHint()); + const _9: rt.u8 = rt.u8Rem(steps, 4); + let iterStart: rt.u8 = 0; + const iterEnd: rt.u8 = _9; + while (iterStart++ < iterEnd) { + rt.iterToOption(it.next()); + put(out, it.sizeHint()); + } +} + +/** As `walk`, of an iterator that reads only from the front. */ +export function walkFront$FromFn_hints_closure23(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); let iterStart: rt.u8 = 0; @@ -1455,7 +1488,7 @@ export function walkFront$MapWhile_Range_u64_hints_closure5(it: rt.Iter, } /** As `walk`, of an iterator that reads only from the front. */ -export function walkFront$Peekable_Filter_Range_u64_hints_closure26(it: rt.Peekable, steps: rt.u8, out: rt.ByteVec): void { +export function walkFront$Peekable_Filter_Range_u64_hints_closure29(it: rt.Peekable, steps: rt.u8, out: rt.ByteVec): void { put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); let iterStart: rt.u8 = 0; @@ -1491,7 +1524,7 @@ export function walkFront$Skip_Endless(it: rt.Iter, steps: rt.u8, out: r } /** As `walk`, of an iterator that reads only from the front. */ -export function walkFront$Skip_Flatten_Map_Range_u32_hints_closure28(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walkFront$Skip_Flatten_Map_Range_u32_hints_closure31(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); let iterStart: rt.u8 = 0; @@ -1551,7 +1584,7 @@ export function walkFront$StepBy_Range_u64(it: rt.Iter, steps: rt.u8, ou } /** As `walk`, of an iterator that reads only from the front. */ -export function walkFront$Successors_u64_hints_closure18(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walkFront$Successors_u64_hints_closure21(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); let iterStart: rt.u8 = 0; @@ -1563,7 +1596,7 @@ export function walkFront$Successors_u64_hints_closure18(it: rt.Iter, st } /** As `walk`, of an iterator that reads only from the front. */ -export function walkFront$Successors_u8_hints_closure19(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walkFront$Successors_u8_hints_closure22(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); let iterStart: rt.u8 = 0; @@ -1599,7 +1632,7 @@ export function walkFront$Take_Endless(it: rt.Iter, steps: rt.u8, out: r } /** As `walk`, of an iterator that reads only from the front. */ -export function walkFront$Take_FlatMap_Range_u64_Range_u64_hints_closure29(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { +export function walkFront$Take_FlatMap_Range_u64_Range_u64_hints_closure32(it: rt.Iter, steps: rt.u8, out: rt.ByteVec): void { put(out, it.sizeHint()); const _9: rt.u8 = rt.u8Rem(steps, 4); let iterStart: rt.u8 = 0; @@ -1797,19 +1830,19 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { return rt.u64CheckedSub(i19, 1); }), steps, out); } else if (_190 === 2) { - walkFront$SkipWhile_Range_u64_hints_closure3(rt.iterSkipWhile(new rt.Range(0, n, rt.u64Step), (_252: rt.u64): boolean => { - return rt.u64Lt(_252, 2); + walkFront$SkipWhile_Range_u64_hints_closure3(rt.iterSkipWhile(new rt.Range(0, n, rt.u64Step), (_253: rt.u64): boolean => { + return rt.u64Lt(_253, 2); }), steps, out); } else if (_190 === 3) { - walkFront$TakeWhile_Range_u64_hints_closure4(rt.iterTakeWhile(new rt.Range(0, n, rt.u64Step), (_250: rt.u64): boolean => { - return rt.u64Lt(_250, 1); + walkFront$TakeWhile_Range_u64_hints_closure4(rt.iterTakeWhile(new rt.Range(0, n, rt.u64Step), (_252: rt.u64): boolean => { + return rt.u64Lt(_252, 1); }), steps, out); } else if (_190 === 4) { walkFront$MapWhile_Range_u64_hints_closure5(rt.iterMapWhile(new rt.Range(0, n, rt.u64Step), (i16: rt.u64): rt.u64 | undefined => { return rt.u64CheckedSub(i16, 1); }), steps, out); } else { - walkFront$Filter_Endless_hints_closure6(rt.iterFilter(rt.iterFrom({ _0: n }, (it: Endless.Endless) => Endless.next$Iterator(it)), (_248: rt.u64): boolean => { + walkFront$Filter_Endless_hints_closure6(rt.iterFilter(rt.iterFrom({ _0: n }, (it: Endless.Endless) => Endless.next$Iterator(it)), (_250: rt.u64): boolean => { return true; }), steps, out); } @@ -1820,7 +1853,7 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { return rt.u64Add(i15, 1); }), steps, out); } else if (_204 === 1) { - walk$Inspect_Range_u64_hints_closure8(rt.iterInspect(new rt.Range(0, n, rt.u64Step), (_247: rt.u64): undefined => {}), steps, out); + walk$Inspect_Range_u64_hints_closure8(rt.iterInspect(new rt.Range(0, n, rt.u64Step), (_248: rt.u64): undefined => {}), steps, out); } else if (_204 === 2) { walk$Enumerate_Range_u32(rt.iterEnumerate(new rt.Range(0, u32Of(n))), steps, out); } else if (_204 === 3) { @@ -1859,7 +1892,7 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { rt.peekablePeek(few); put(out, few.sizeHint()); } else if (_37 === 12) { - const _267: rt.u8 = rt.u8Rem(arm, 5); + const _267: rt.u8 = rt.u8Rem(arm, 7); if (_267 === 0) { walk$Flatten_Map_Range_u64_hints_closure9(rt.iterFlatten(rt.iterMap(new rt.Range(0, n, rt.u64Step), (i14: rt.u64): rt.u64[] => { return Array.from({ length: 3 }, (): rt.u64 => { @@ -1876,8 +1909,16 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { walk$Flatten_Map_Range_u64_hints_closure11(rt.iterFlatten(rt.iterMap(new rt.Range(0, rt.u64Min(n, 9), rt.u64Step), (i12: rt.u64): rt.Range => { return new rt.Range(0, i12, rt.u64Step); })), steps, out); + } else if (_267 === 5) { + walk$Flatten_Map_Range_u64_hints_closure12(rt.iterFlatten(rt.iterMap(new rt.Range(0, rt.u64Min(n, 9), rt.u64Step), (_247: rt.u64): Uint8Array => { + return Uint8Array.of(); + }), (value: Uint8Array) => rt.iterSlice(value), false, 0, true), steps, out); + } else if (_267 === 6) { + put(out, rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (_i: rt.u64): rt.u64[] => { + return []; + }, (value: rt.u64[]) => rt.iterSlice(value), false, 0, true).sizeHint()); } else { - walk$FlatMap_Range_u64_Flatten_IntoIter_u64s_hints_closure12(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i11: rt.u64): rt.Iter => { + walk$FlatMap_Range_u64_Flatten_IntoIter_u64s_hints_closure14(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i11: rt.u64): rt.Iter => { const item = copy$u64s(Array.from({ length: 2 }, (): rt.u64 => { return i11; })); @@ -1887,27 +1928,27 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { }), steps, out); } } else if (_37 === 13) { - const _282: rt.u8 = rt.u8Rem(arm, 6); - if (_282 === 0) { - walk$Flatten_Map_Range_u64_hints_closure13(rt.iterFlatten(rt.iterMap(new rt.Range(0, n, rt.u64Step), (i10: rt.u64): rt.u64 | undefined => { + const _290: rt.u8 = rt.u8Rem(arm, 6); + if (_290 === 0) { + walk$Flatten_Map_Range_u64_hints_closure15(rt.iterFlatten(rt.iterMap(new rt.Range(0, n, rt.u64Step), (i10: rt.u64): rt.u64 | undefined => { return rt.u64CheckedSub(i10, 2); }), (value: rt.u64 | undefined) => rt.iterOption(value), false, undefined, true), steps, out); - } else if (_282 === 1) { - walk$FlatMap_Range_u64_Option_u64_hints_closure14(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i9: rt.u64): rt.u64 | undefined => { + } else if (_290 === 1) { + walk$FlatMap_Range_u64_Option_u64_hints_closure16(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i9: rt.u64): rt.u64 | undefined => { return thenSome$1ugl8af(rt.u64Rem(i9, 2) === 0, i9); }, (value: rt.u64 | undefined) => rt.iterOption(value), false, undefined, true), steps, out); - } else if (_282 === 2) { + } else if (_290 === 2) { walk$FlatMap_Range_u64_Once_u64_once(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (a0: rt.u64): rt.Iter => { return rt.iterOnce(a0); }, undefined, false, undefined, true), steps, out); - } else if (_282 === 3) { - walk$FlatMap_Range_u64_Filter_IntoIter_u64_hints_closure15_closure0_hints_closure15(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i7: rt.u64): rt.Iter => { + } else if (_290 === 3) { + walk$FlatMap_Range_u64_Filter_IntoIter_u64_hints_closure17_closure0_hints_closure17(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i7: rt.u64): rt.Iter => { return rt.iterFilter(rt.iterOption(i7), (i8: rt.u64): boolean => { return rt.u64Rem(i8, 2) === 0; }); }, undefined, false, undefined, true), steps, out); - } else if (_282 === 4) { - walk$Flatten_Map_Iter_u8_hints_closure16(rt.iterFlatten(rt.iterMap(rt.iterSlice(rt.byteSliceView(bytes)), (_245: rt.u8): Uint8Array => { + } else if (_290 === 4) { + walk$Flatten_Map_Iter_u8_hints_closure18(rt.iterFlatten(rt.iterMap(rt.iterSlice(rt.byteSliceView(bytes)), (_245: rt.u8): Uint8Array => { return Uint8Array.of(_245); }), (value: Uint8Array) => rt.iterSlice(value), false, 1, true), steps, out); } else { @@ -1917,36 +1958,43 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { }), undefined, 2, true)), rt.byteSliceFrom), (value: rt.ByteSlice) => rt.iterSlice(rt.byteSliceView(value)), false, 2), steps, out); } } else if (_37 === 14) { - const _304: rt.u8 = rt.u8Rem(arm, 6); - if (_304 === 0) { + const _312: rt.u8 = rt.u8Rem(arm, 6); + if (_312 === 0) { walk$Iter_u8$5(rt.iterSlice(rt.byteSliceView(bytes)), steps, out); - } else if (_304 === 1) { + } else if (_312 === 1) { walk$IntoIter_u8$3(rt.iterSlice(rt.byteVecView(rt.byteSliceToByteVec(bytes))), steps, out); - } else if (_304 === 2) { + } else if (_312 === 2) { walk$IntoIter_u8(rt.iterSlice(Uint8Array.of(at(3), at(4), at(5))), steps, out); - } else if (_304 === 3) { + } else if (_312 === 3) { walk$IntoIter_u8$2(rt.iterOption(rt.byteSliceFirst(bytes)), steps, out); - } else if (_304 === 4) { + } else if (_312 === 4) { walk$Once_u64(rt.iterOnce(n), steps, out); } else { rt.iterEmpty(); - walk$Empty_u8(rt.iterEmpty(), steps, out); + walk$Empty_u8(rt.iterEmpty() as rt.Iter, steps, out); } } else if (_37 === 15) { - const _324: rt.u8 = rt.u8Rem(arm, 5); - if (_324 === 0) { - walkFront$Successors_u64_hints_closure18(rt.iterSuccessors(rt.u64Rem(n, 4), (_242: rt.u64): rt.u64 | undefined => { + const _332: rt.u8 = rt.u8Rem(arm, 6); + if (_332 === 5) { + rt.iterFromFn((): rt.u8 | undefined => { + return undefined; + }); + walkFront$FromFn_hints_closure20(rt.iterFromFn((): rt.u8 | undefined => { + return undefined; + }), steps, out); + } else if (_332 === 0) { + walkFront$Successors_u64_hints_closure21(rt.iterSuccessors(rt.u64Rem(n, 4), (_242: rt.u64): rt.u64 | undefined => { return rt.u64CheckedSub(_242, 1); }), steps, out); - } else if (_324 === 1) { - walkFront$Successors_u8_hints_closure19(rt.iterSuccessors(undefined as rt.u8 | undefined, (_237: rt.u8): rt.u8 | undefined => { + } else if (_332 === 1) { + walkFront$Successors_u8_hints_closure22(rt.iterSuccessors(undefined as rt.u8 | undefined, (_237: rt.u8): rt.u8 | undefined => { return _237; }), steps, out); - } else if (_324 === 2) { + } else if (_332 === 2) { walkFront$Countdown({ _0: rt.u64Low(n) & 0xff }, steps, out); - } else if (_324 === 3) { + } else if (_332 === 3) { const captured = n; - walkFront$FromFn_hints_closure20(rt.iterFromFn((): rt.u64 | undefined => { + walkFront$FromFn_hints_closure23(rt.iterFromFn((): rt.u64 | undefined => { return captured; }), steps, out); } else { @@ -1962,107 +2010,107 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { } return [97, 233, 128512, 2048][_5]; })); - const _346: rt.u8 = rt.u8Rem(arm, 4); - if (_346 === 0) { + const _355: rt.u8 = rt.u8Rem(arm, 4); + if (_355 === 0) { walk$Chars(rt.strChars(s), steps, out); - } else if (_346 === 1) { + } else if (_355 === 1) { walkFront$Split_char(rt.strSplit(s, "é"), steps, out); - } else if (_346 === 2) { + } else if (_355 === 2) { walk$Bytes(rt.strBytes(s), steps, out); } else { let t: string = s; - const _370: { start: rt.usize } = { start: rt.iterSum(rt.iterMap(rt.iterSlice(rt.byteSliceView(rt.byteSliceRange(bytes, 0, rt.usizeDiv(bytes.length, 2)))), (_231: rt.u8): rt.usize => { - const _510: rt.usize = rt.u8Rem(_231, 4) as rt.usize; - if (!(_510 < 4)) { - rt.panic("index out of bounds: the len is " + 4 + " but the index is " + _510); + const _379: { start: rt.usize } = { start: rt.iterSum(rt.iterMap(rt.iterSlice(rt.byteSliceView(rt.byteSliceRange(bytes, 0, rt.usizeDiv(bytes.length, 2)))), (_231: rt.u8): rt.usize => { + const _512: rt.usize = rt.u8Rem(_231, 4) as rt.usize; + if (!(_512 < 4)) { + rt.panic("index out of bounds: the len is " + 4 + " but the index is " + _512); } - return [1, 2, 4, 3][_510]; + return [1, 2, 4, 3][_512]; }), rt.usizeAdd, 0) }; - walk$Drain(rt.stringDrain(rt.place(() => t, (value) => t = value), _370), steps, out); + walk$Drain(rt.stringDrain(rt.place(() => t, (value) => t = value), _379), steps, out); } } else if (_37 === 17) { const size: rt.usize = rt.usizeAdd(rt.usizeRem(at(1) as rt.usize, 4), 1); - const _379: rt.u8 = rt.u8Rem(arm, 5); - if (_379 === 0) { + const _388: rt.u8 = rt.u8Rem(arm, 5); + if (_388 === 0) { walk$Windows_u8(rt.byteSliceWindows(bytes, size), steps, out); - } else if (_379 === 1) { + } else if (_388 === 1) { walk$Chunks_u8(rt.byteSliceChunks(bytes, size), steps, out); - } else if (_379 === 2) { + } else if (_388 === 2) { walk$ChunksExact_u8(rt.byteSliceChunksExact(bytes, size), steps, out); - } else if (_379 === 3) { + } else if (_388 === 3) { walk$RChunks_u8(rt.byteSliceRchunks(bytes, size), steps, out); } else { walk$RChunksExact_u8(rt.byteSliceRchunksExact(bytes, size), steps, out); } } else if (_37 === 18) { - const _387: rt.Iter<[rt.u8, rt.u8]> = rt.iterMap(rt.iterSlice(rt.byteSliceView(bytes)), (_27: rt.u8): [rt.u8, rt.u8] => { + const _396: rt.Iter<[rt.u8, rt.u8]> = rt.iterMap(rt.iterSlice(rt.byteSliceView(bytes)), (_27: rt.u8): [rt.u8, rt.u8] => { const b2: rt.u8 = _27; return [b2, b2] as [rt.u8, rt.u8]; }); - const map: rt.HashMap = rt.hashExtend(rt.hashNew() as rt.HashMap, _387, undefined, undefined, undefined, 469762048); - const _390: rt.Iter = rt.iterSlice(rt.byteSliceView(bytes)); - const set: rt.HashSet = rt.hashExtendKeys(rt.hashNew() as rt.HashSet, _390, undefined, undefined, 469762048); - const _392: rt.u8 = rt.u8Rem(arm, 5); - if (_392 === 0) { + const map: rt.HashMap = rt.hashExtend(rt.hashNew() as rt.HashMap, _396, undefined, undefined, undefined, 469762048); + const _399: rt.Iter = rt.iterSlice(rt.byteSliceView(bytes)); + const set: rt.HashSet = rt.hashExtendKeys(rt.hashNew() as rt.HashSet, _399, undefined, undefined, 469762048); + const _401: rt.u8 = rt.u8Rem(arm, 5); + if (_401 === 0) { walkFront$Iter_u8_u8(rt.hashIter(map), steps, out); - } else if (_392 === 1) { + } else if (_401 === 1) { walkFront$Keys_u8_u8(rt.hashKeys(map), steps, out); - } else if (_392 === 2) { + } else if (_401 === 2) { walkFront$Iter_u8(rt.hashKeys(set), steps, out); - } else if (_392 === 3) { + } else if (_401 === 3) { walkFront$IntoIter_u8_u8(rt.hashIter(rt.hashClone(map, undefined, undefined)), steps, out); } else { walkFront$Drain_u8_u8(rt.hashDrain(rt.hashClone(map, undefined, undefined)), steps, out); } } else if (_37 === 19) { - const _408: rt.Iter<[rt.u8, rt.u8]> = rt.iterMap(rt.iterSlice(rt.byteSliceView(bytes)), (_26: rt.u8): [rt.u8, rt.u8] => { + const _417: rt.Iter<[rt.u8, rt.u8]> = rt.iterMap(rt.iterSlice(rt.byteSliceView(bytes)), (_26: rt.u8): [rt.u8, rt.u8] => { const b: rt.u8 = _26; return [b, b] as [rt.u8, rt.u8]; }); - const map2: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _408, true, undefined, undefined, undefined, 2, true); - const _411: rt.Iter = rt.iterSlice(rt.byteSliceView(bytes)); - const set2: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _411, true, undefined, undefined, 1, true); - const _413: rt.u8 = rt.u8Rem(arm, 4); - if (_413 === 0) { + const map2: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _417, true, undefined, undefined, undefined, 2, true); + const _420: rt.Iter = rt.iterSlice(rt.byteSliceView(bytes)); + const set2: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _420, true, undefined, undefined, 1, true); + const _422: rt.u8 = rt.u8Rem(arm, 4); + if (_422 === 0) { walk$Iter_u8_u8(rt.btreeIter(map2), steps, out); - } else if (_413 === 1) { - const _419: { start: rt.u8 } = { start: at(3) }; - walk$Range_u8_u8(rt.btreeRange(map2, _419), steps, out); - } else if (_413 === 2) { + } else if (_422 === 1) { + const _428: { start: rt.u8 } = { start: at(3) }; + walk$Range_u8_u8(rt.btreeRange(map2, _428), steps, out); + } else if (_422 === 2) { walk$Iter_u8$3(rt.btreeKeys(set2), steps, out); } else { walk$Values_u8_u8(rt.btreeValues(map2), steps, out); } } else if (_37 === 20) { - const _428: rt.Iter = rt.iterSlice(rt.byteSliceView(bytes)); - const deque: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, _428, undefined, 1, true); + const _437: rt.Iter = rt.iterSlice(rt.byteSliceView(bytes)); + const deque: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, _437, undefined, 1, true); const v: rt.ByteVec = rt.byteSliceToByteVec(bytes); const heap: rt.BinaryHeap = rt.heapFrom(rt.iterToArray(rt.iterSlice(rt.byteSliceView(bytes)), undefined, 1, true), rt.le, rt.ge, rt.lt); const half2: rt.usize = rt.usizeDiv(bytes.length, 2); - const _437: rt.u8 = rt.u8Rem(arm, 4); - if (_437 === 0) { + const _446: rt.u8 = rt.u8Rem(arm, 4); + if (_446 === 0) { walk$Iter_u8$4(rt.dequeIter(deque), steps, out); - } else if (_437 === 1) { + } else if (_446 === 1) { walk$Drain_u8(rt.dequeDrain(deque, { start: half2 }), steps, out); - } else if (_437 === 2) { + } else if (_446 === 2) { walk$Drain_u8$2(rt.byteVecDrain(v, { end: half2 }), steps, out); } else { walk$Iter_u8$2(rt.heapIter(heap), steps, out); } } else if (_37 === 21) { - const _449: rt.u8 = rt.u8Rem(arm, 4); - if (_449 === 0) { + const _458: rt.u8 = rt.u8Rem(arm, 4); + if (_458 === 0) { walkFront$Take_Skip_Chain_Range_u64_Range_u64(rt.iterTake(rt.iterSkip(rt.iterChain(new rt.Range(0, n, rt.u64Step), new rt.Range(0, m, rt.u64Step)), 3), u32Of(n) as rt.usize), steps, out); - } else if (_449 === 1) { + } else if (_458 === 1) { walk$StepBy_Rev_Zip_Range_u32_Range_u32(rt.iterStepBy(rt.iterRev(rt.iterZip(new rt.Range(0, u32Of(rt.u64Min(n, 9))), new rt.Range(0, u32Of(rt.u64Min(m, 9))), true)), 2), steps, out); - } else if (_449 === 2) { - walk$Chain_Flatten_Map_Range_u64_hints_closure25_Range_u64(rt.iterChain(rt.iterFlatten(rt.iterMap(new rt.Range(0, n, rt.u64Step), (i4: rt.u64): rt.u64[] => { + } else if (_458 === 2) { + walk$Chain_Flatten_Map_Range_u64_hints_closure28_Range_u64(rt.iterChain(rt.iterFlatten(rt.iterMap(new rt.Range(0, n, rt.u64Step), (i4: rt.u64): rt.u64[] => { return Array.from({ length: 2 }, (): rt.u64 => { return i4; }); }), (value: rt.u64[]) => rt.iterSlice(value), false, 2), new rt.Range(0, m, rt.u64Step)), steps, out); } else { - walkFront$Peekable_Filter_Range_u64_hints_closure26(rt.iterPeekable(rt.iterFilter(new rt.Range(0, n, rt.u64Step), (_22: rt.u64): boolean => { + walkFront$Peekable_Filter_Range_u64_hints_closure29(rt.iterPeekable(rt.iterFilter(new rt.Range(0, n, rt.u64Step), (_22: rt.u64): boolean => { return true; })), steps, out); } @@ -2071,19 +2119,19 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { walk$Chain_Range_u64_Range_u64(it3, steps, out); put(out, it3.sizeHint()); } else { - const _483: rt.u8 = rt.u8Rem(arm, 3); - if (_483 === 0) { - walkFront$Chain_Map_Zip_Range_u64_Range_u64_hints_closure27_Once_u64(rt.iterChain(rt.iterMap(rt.iterZip(new rt.Range(0, n, rt.u64Step), new rt.Range(0, m, rt.u64Step)), (_2: [rt.u64, rt.u64]): rt.u64 => { + const _492: rt.u8 = rt.u8Rem(arm, 3); + if (_492 === 0) { + walkFront$Chain_Map_Zip_Range_u64_Range_u64_hints_closure30_Once_u64(rt.iterChain(rt.iterMap(rt.iterZip(new rt.Range(0, n, rt.u64Step), new rt.Range(0, m, rt.u64Step)), (_2: [rt.u64, rt.u64]): rt.u64 => { return _2[0]; }), rt.iterOnce(0)), steps, out); - } else if (_483 === 1) { - walkFront$Skip_Flatten_Map_Range_u32_hints_closure28(rt.iterSkip(rt.iterFlatten(rt.iterMap(new rt.Range(0, u32Of(n)), (i3: rt.u32): rt.u32[] => { + } else if (_492 === 1) { + walkFront$Skip_Flatten_Map_Range_u32_hints_closure31(rt.iterSkip(rt.iterFlatten(rt.iterMap(new rt.Range(0, u32Of(n)), (i3: rt.u32): rt.u32[] => { return Array.from({ length: 2 }, (): rt.u32 => { return i3; }); }), (value: rt.u32[]) => rt.iterSlice(value), false, 2), rt.usizeRem(rt.u64Low(m), 9)), steps, out); } else { - walkFront$Take_FlatMap_Range_u64_Range_u64_hints_closure29(rt.iterTake(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i2: rt.u64): rt.Range => { + walkFront$Take_FlatMap_Range_u64_Range_u64_hints_closure32(rt.iterTake(rt.iterFlatMap(new rt.Range(0, n, rt.u64Step), (i2: rt.u64): rt.Range => { return new rt.Range(0, i2, rt.u64Step); }), rt.u64Low(m)), steps, out); } @@ -2100,7 +2148,7 @@ export function hints(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { * whenever it fills. */ export function reserves(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { - const _4: rt.u8 = rt.u8Rem(rt.u8Div(kind, 13), 5); + const _4: rt.u8 = rt.u8Rem(rt.u8Div(kind, 13), 6); if (_4 === 0) { typed$u8_reserves_closure0(kind, data, (i5: rt.u32): rt.u8 => { return i5 & 0xff; @@ -2117,8 +2165,12 @@ export function reserves(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void typed$u64_u8_reserves_closure3(kind, data, (i2: rt.u32): [rt.u64, rt.u8] => { return [i2 as rt.u64, i2 & 0xff] as [rt.u64, rt.u8]; }, { vec: 134217727, pairs: 89478485, set: 58720256, map: 58720256 }, out); + } else if (_4 === 5) { + typed$Unit_reserves_closure4(kind, data, (_2: rt.u32): Unit.Unit => { + return {}; + }, { vec: 4294967295, pairs: 536870911, set: 536870911, map: 234881024 }, out); } else { - typed$Big_reserves_closure4(kind, data, (i: rt.u32): Big.Big => { + typed$Big_reserves_closure5(kind, data, (i: rt.u32): Big.Big => { return { _0: Array.from({ length: 275 }, (): rt.u32 => { return i; }) }; @@ -2127,7 +2179,7 @@ export function reserves(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void } /** `reserves` of elements `make` makes. */ -export function typed$Big_reserves_closure4(kind: rt.u8, data: rt.ByteSlice, make: (a0: rt.u32) => Big.Big, most: Most.Most, out: rt.ByteVec): void { +export function typed$Big_reserves_closure5(kind: rt.u8, data: rt.ByteSlice, make: (a0: rt.u32) => Big.Big, most: Most.Most, out: rt.ByteVec): void { let _20!: [rt.u64, rt.u64]; let past!: rt.u64; let count!: rt.u64; @@ -2198,6 +2250,78 @@ export function typed$Big_reserves_closure4(kind: rt.u8, data: rt.ByteSlice, mak rt.byteVecPush(out, calls.v); } +/** `reserves` of elements `make` makes. */ +export function typed$Unit_reserves_closure4(kind: rt.u8, data: rt.ByteSlice, make: (a0: rt.u32) => Unit.Unit, most: Most.Most, out: rt.ByteVec): void { + let _20!: [rt.u64, rt.u64]; + let past!: rt.u64; + let count!: rt.u64; + const at: (a0: rt.usize) => rt.u8 = (i: rt.usize): rt.u8 => { + return unwrapOr$0r2bmpr(rt.byteSliceGet(data, i), 0); + }; + const coll: rt.u8 = rt.u8Rem(kind, 13); + const _11: rt.usize = rt.usizeRem(at(2) as rt.usize, 5); + if (!(_11 < 5)) { + rt.panic("index out of bounds: the len is " + 5 + " but the index is " + _11); + } + const limit: rt.u8 = Uint8Array.of(0, 1, 4, 5, 8)[_11]; + if (coll === 0 || coll === 1 || coll === 3 || coll === 5 || coll === 11 || coll === 12) { + _20 = [0, most.vec] as [rt.u64, rt.u64]; + } else if (coll === 2 || coll === 4 || coll === 6) { + _20 = [2, most.vec] as [rt.u64, rt.u64]; + } else if (coll === 7) { + _20 = [0, most.vec] as [rt.u64, rt.u64]; + } else if (coll === 8) { + _20 = [0, most.set] as [rt.u64, rt.u64]; + } else if (coll === 9) { + _20 = [1, most.map] as [rt.u64, rt.u64]; + } else { + _20 = [0, most.pairs] as [rt.u64, rt.u64]; + } + const held: rt.u64 = _20[0]; + const most2: rt.u64 = _20[1]; + if (coll === 9) { + past = rt.u64Add(rt.u64Mul(2, rt.u64Sub(most2, held)), 1); + } else { + past = rt.u64Add(rt.u64Sub(most2, held), 1); + } + const shape: rt.u8 = rt.u8Rem(at(0), 5); + const _42: rt.u8 = rt.u8Rem(at(1), 4); + if (_42 === 0) { + count = 3; + } else if (_42 === 1) { + count = rt.u64Add(past, shape === 1 ? 1 : 0); + } else if (_42 === 2) { + count = 4294967295 as rt.u64; + } else { + count = 4294967296; + } + const last: rt.u32 = rt.resultUnwrap(rt.u32TryFrom(rt.u64Sub(rt.u64Min(count, 4294967296), 1)), rt.fmtTryFromIntErrorDebug); + const seed: Unit.Unit = make(7); + const calls: rt.Cell = new rt.Cell(0); + const f: (a0: rt.u32) => Unit.Unit = (i2: rt.u32): Unit.Unit => { + rt.cellSet(calls, rt.u8Add(calls.v, 1)); + if (!(calls.v <= limit)) { + rt.panicFmt(["consumed"]); + } else { + return make(i2); + } + }; + if (shape === 0) { + fill$Unit_Map_RangeInclusive_u32_typed_closure1(coll, rt.iterMap(new rt.RangeInclusive(0, last, rt.u32Step), f), seed, out); + } else if (shape === 1) { + fill$Unit_Skip_Map_RangeInclusive_u32_typed_closure1(coll, rt.iterSkip(rt.iterMap(new rt.RangeInclusive(0, last, rt.u32Step), f), 1), seed, out); + } else if (shape === 2) { + fill$Unit_Filter_Map_RangeInclusive_u32_typed_closure1_typed_closure2(coll, rt.iterFilter(rt.iterMap(new rt.RangeInclusive(0, last, rt.u32Step), f), (_2: Unit.Unit): boolean => { + return true; + }), seed, out); + } else if (shape === 3) { + fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1(coll, rt.iterMap(rt.iterFlatten(rt.iterSlice([new rt.RangeInclusive(0, 2, rt.u32Step), new rt.RangeInclusive(0, last, rt.u32Step)])), f), seed, out); + } else { + fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1$2(coll, rt.iterMap(rt.iterFlatten(rt.iterSlice([new rt.RangeInclusive(0, 2, rt.u32Step), new rt.RangeInclusive(0, 2, rt.u32Step), new rt.RangeInclusive(0, last, rt.u32Step)])), f), seed, out); + } + rt.byteVecPush(out, calls.v); +} + /** `reserves` of elements `make` makes. */ export function typed$u32_reserves_closure1(kind: rt.u8, data: rt.ByteSlice, make: (a0: rt.u32) => rt.u32, most: Most.Most, out: rt.ByteVec): void { let _20!: [rt.u64, rt.u64]; @@ -2836,6 +2960,356 @@ export function fill$Big_Skip_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8, rt.byteVecExtendFromSlice(out, rt.byteSliceFrom(rt.u32ToBeBytes(len as rt.u32))); } +/** `items` collected into the collection `coll` picks, or extended into one holding `seed`. */ +export function fill$Unit_Filter_Map_RangeInclusive_u32_typed_closure1_typed_closure2(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { + let len!: rt.usize; + if (coll === 0) { + len = rt.iterToArray(items, undefined, 0).length; + } else if (coll === 1) { + const v: Unit.Unit[] = []; + rt.iterExtend(v, items, undefined, 0); + len = v.length; + } else if (coll === 2) { + const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + rt.iterExtend(v2, items, undefined, 0); + len = v2.length; + } else if (coll === 3) { + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + } else if (coll === 4) { + const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); + rt.dequeExtend(q, items, undefined, 0); + len = q.n; + } else if (coll === 5) { + len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + } else if (coll === 6) { + const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + len = h.d.length; + } else if (coll === 7) { + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + } else if (coll === 8) { + len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); + } else if (coll === 9) { + const _41: [Unit.Unit, rt.u32][] = [[seed, 0] as [Unit.Unit, rt.u32]]; + const m: rt.HashMap = rt.hashExtend(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashMap, rt.iterSlice(_41), undefined, undefined, undefined, 234881024); + const _46: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t3: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t3, 1] as [Unit.Unit, rt.u32]; + }); + rt.hashExtend(m, _46, undefined, undefined, undefined, 234881024); + len = rt.hashLen(m); + } else if (coll === 10) { + const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t2, 1] as [Unit.Unit, rt.u32]; + }); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + } else if (coll === 11) { + len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { + return a0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + return v4.length; + }); + } else { + const _53: rt.Result = rt.iterCollectResult(rt.iterMap(rt.iterEnumerate(items), (_2: [rt.usize, Unit.Unit]): rt.Result => { + let _0!: rt.Result; + const i2: rt.usize = _2[0]; + const t: Unit.Unit = _2[1]; + if (!(i2 < 3)) { + _0 = rt.Err(i2); + } else { + _0 = rt.Ok(t); + } + return _0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + if (_53.ok) { + len = _53.value.length; + } else { + len = rt.usizeAdd(256, _53.error); + } + } + rt.byteVecExtendFromSlice(out, rt.byteSliceFrom(rt.u32ToBeBytes(len as rt.u32))); +} + +/** `items` collected into the collection `coll` picks, or extended into one holding `seed`. */ +export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { + let len!: rt.usize; + if (coll === 0) { + len = rt.iterToArray(items, undefined, 0).length; + } else if (coll === 1) { + const v: Unit.Unit[] = []; + rt.iterExtend(v, items, undefined, 0); + len = v.length; + } else if (coll === 2) { + const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + rt.iterExtend(v2, items, undefined, 0); + len = v2.length; + } else if (coll === 3) { + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + } else if (coll === 4) { + const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); + rt.dequeExtend(q, items, undefined, 0); + len = q.n; + } else if (coll === 5) { + len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + } else if (coll === 6) { + const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + len = h.d.length; + } else if (coll === 7) { + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + } else if (coll === 8) { + len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); + } else if (coll === 9) { + const _41: [Unit.Unit, rt.u32][] = [[seed, 0] as [Unit.Unit, rt.u32]]; + const m: rt.HashMap = rt.hashExtend(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashMap, rt.iterSlice(_41), undefined, undefined, undefined, 234881024); + const _46: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t3: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t3, 1] as [Unit.Unit, rt.u32]; + }); + rt.hashExtend(m, _46, undefined, undefined, undefined, 234881024); + len = rt.hashLen(m); + } else if (coll === 10) { + const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t2, 1] as [Unit.Unit, rt.u32]; + }); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + } else if (coll === 11) { + len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { + return a0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + return v4.length; + }); + } else { + const _53: rt.Result = rt.iterCollectResult(rt.iterMap(rt.iterEnumerate(items), (_2: [rt.usize, Unit.Unit]): rt.Result => { + let _0!: rt.Result; + const i2: rt.usize = _2[0]; + const t: Unit.Unit = _2[1]; + if (!(i2 < 3)) { + _0 = rt.Err(i2); + } else { + _0 = rt.Ok(t); + } + return _0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + if (_53.ok) { + len = _53.value.length; + } else { + len = rt.usizeAdd(256, _53.error); + } + } + rt.byteVecExtendFromSlice(out, rt.byteSliceFrom(rt.u32ToBeBytes(len as rt.u32))); +} + +/** `items` collected into the collection `coll` picks, or extended into one holding `seed`. */ +export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1$2(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { + let len!: rt.usize; + if (coll === 0) { + len = rt.iterToArray(items, undefined, 0).length; + } else if (coll === 1) { + const v: Unit.Unit[] = []; + rt.iterExtend(v, items, undefined, 0); + len = v.length; + } else if (coll === 2) { + const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + rt.iterExtend(v2, items, undefined, 0); + len = v2.length; + } else if (coll === 3) { + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + } else if (coll === 4) { + const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); + rt.dequeExtend(q, items, undefined, 0); + len = q.n; + } else if (coll === 5) { + len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + } else if (coll === 6) { + const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + len = h.d.length; + } else if (coll === 7) { + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + } else if (coll === 8) { + len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); + } else if (coll === 9) { + const _41: [Unit.Unit, rt.u32][] = [[seed, 0] as [Unit.Unit, rt.u32]]; + const m: rt.HashMap = rt.hashExtend(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashMap, rt.iterSlice(_41), undefined, undefined, undefined, 234881024); + const _46: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t3: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t3, 1] as [Unit.Unit, rt.u32]; + }); + rt.hashExtend(m, _46, undefined, undefined, undefined, 234881024); + len = rt.hashLen(m); + } else if (coll === 10) { + const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t2, 1] as [Unit.Unit, rt.u32]; + }); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + } else if (coll === 11) { + len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { + return a0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + return v4.length; + }); + } else { + const _53: rt.Result = rt.iterCollectResult(rt.iterMap(rt.iterEnumerate(items), (_2: [rt.usize, Unit.Unit]): rt.Result => { + let _0!: rt.Result; + const i2: rt.usize = _2[0]; + const t: Unit.Unit = _2[1]; + if (!(i2 < 3)) { + _0 = rt.Err(i2); + } else { + _0 = rt.Ok(t); + } + return _0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + if (_53.ok) { + len = _53.value.length; + } else { + len = rt.usizeAdd(256, _53.error); + } + } + rt.byteVecExtendFromSlice(out, rt.byteSliceFrom(rt.u32ToBeBytes(len as rt.u32))); +} + +/** `items` collected into the collection `coll` picks, or extended into one holding `seed`. */ +export function fill$Unit_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { + let len!: rt.usize; + if (coll === 0) { + len = rt.iterToArray(items, undefined, 0, true).length; + } else if (coll === 1) { + const v: Unit.Unit[] = []; + rt.iterExtend(v, items, undefined, 0, true); + len = v.length; + } else if (coll === 2) { + const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + rt.iterExtend(v2, items, undefined, 0, true); + len = v2.length; + } else if (coll === 3) { + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0, true).n; + } else if (coll === 4) { + const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); + rt.dequeExtend(q, items, undefined, 0, true); + len = q.n; + } else if (coll === 5) { + len = rt.heapFrom(rt.iterToArray(items, undefined, 0, true), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + } else if (coll === 6) { + const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0, true); + len = h.d.length; + } else if (coll === 7) { + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0, true)); + } else if (coll === 8) { + len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); + } else if (coll === 9) { + const _41: [Unit.Unit, rt.u32][] = [[seed, 0] as [Unit.Unit, rt.u32]]; + const m: rt.HashMap = rt.hashExtend(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashMap, rt.iterSlice(_41), undefined, undefined, undefined, 234881024); + const _46: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t3: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t3, 1] as [Unit.Unit, rt.u32]; + }); + rt.hashExtend(m, _46, undefined, undefined, undefined, 234881024); + len = rt.hashLen(m); + } else if (coll === 10) { + const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t2, 1] as [Unit.Unit, rt.u32]; + }); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4, true)); + } else if (coll === 11) { + len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { + return a0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + return v4.length; + }); + } else { + const _53: rt.Result = rt.iterCollectResult(rt.iterMap(rt.iterEnumerate(items), (_2: [rt.usize, Unit.Unit]): rt.Result => { + let _0!: rt.Result; + const i2: rt.usize = _2[0]; + const t: Unit.Unit = _2[1]; + if (!(i2 < 3)) { + _0 = rt.Err(i2); + } else { + _0 = rt.Ok(t); + } + return _0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + if (_53.ok) { + len = _53.value.length; + } else { + len = rt.usizeAdd(256, _53.error); + } + } + rt.byteVecExtendFromSlice(out, rt.byteSliceFrom(rt.u32ToBeBytes(len as rt.u32))); +} + +/** `items` collected into the collection `coll` picks, or extended into one holding `seed`. */ +export function fill$Unit_Skip_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { + let len!: rt.usize; + if (coll === 0) { + len = rt.iterToArray(items, undefined, 0).length; + } else if (coll === 1) { + const v: Unit.Unit[] = []; + rt.iterExtend(v, items, undefined, 0); + len = v.length; + } else if (coll === 2) { + const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + rt.iterExtend(v2, items, undefined, 0); + len = v2.length; + } else if (coll === 3) { + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + } else if (coll === 4) { + const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); + const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); + rt.dequeExtend(q, items, undefined, 0); + len = q.n; + } else if (coll === 5) { + len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + } else if (coll === 6) { + const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + len = h.d.length; + } else if (coll === 7) { + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + } else if (coll === 8) { + len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); + } else if (coll === 9) { + const _41: [Unit.Unit, rt.u32][] = [[seed, 0] as [Unit.Unit, rt.u32]]; + const m: rt.HashMap = rt.hashExtend(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashMap, rt.iterSlice(_41), undefined, undefined, undefined, 234881024); + const _46: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t3: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t3, 1] as [Unit.Unit, rt.u32]; + }); + rt.hashExtend(m, _46, undefined, undefined, undefined, 234881024); + len = rt.hashLen(m); + } else if (coll === 10) { + const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { + return [t2, 1] as [Unit.Unit, rt.u32]; + }); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + } else if (coll === 11) { + len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { + return a0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + return v4.length; + }); + } else { + const _53: rt.Result = rt.iterCollectResult(rt.iterMap(rt.iterEnumerate(items), (_2: [rt.usize, Unit.Unit]): rt.Result => { + let _0!: rt.Result; + const i2: rt.usize = _2[0]; + const t: Unit.Unit = _2[1]; + if (!(i2 < 3)) { + _0 = rt.Err(i2); + } else { + _0 = rt.Ok(t); + } + return _0; + }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + if (_53.ok) { + len = _53.value.length; + } else { + len = rt.usizeAdd(256, _53.error); + } + } + rt.byteVecExtendFromSlice(out, rt.byteSliceFrom(rt.u32ToBeBytes(len as rt.u32))); +} + /** `items` collected into the collection `coll` picks, or extended into one holding `seed`. */ export function fill$u32_Filter_Map_RangeInclusive_u32_typed_closure1_typed_closure2(coll: rt.u8, items: rt.Iter, seed: rt.u32, out: rt.ByteVec): void { let len!: rt.usize; diff --git a/ts/fixtures/lang/expected/iters.ts b/ts/fixtures/lang/expected/iters.ts index 2b58cb629..27c51bb12 100644 --- a/ts/fixtures/lang/expected/iters.ts +++ b/ts/fixtures/lang/expected/iters.ts @@ -1342,7 +1342,7 @@ export function options(data: rt.ByteSlice, out: rt.ByteVec): void { } const _57: rt.Iter = rt.iterOption(first); rt.iterEmpty(); - rt.iterExtendBytes(out, rt.iterChain(_57, rt.iterEmpty()), undefined, true); + rt.iterExtendBytes(out, rt.iterChain(_57, rt.iterEmpty() as rt.Iter), undefined, true); let n: rt.u8 = 0; rt.byteVecExtendFromSlice(out, rt.byteVecSlice(rt.iterToByteVec(rt.iterFromFn((): rt.u8 | undefined => { n = rt.u8Add(n, 1); @@ -1354,7 +1354,7 @@ export function options(data: rt.ByteSlice, out: rt.ByteVec): void { k = rt.u8Add(k, 1); return thenSome$0d5am30(k !== 2, k); }); - const gappy: rt.Iter = rt.iterChain(rt.iterEmpty(), _70); + const gappy: rt.Iter = rt.iterChain(rt.iterEmpty() as rt.Iter, _70); rt.byteVecPush(out, rt.iterCount(rt.iterBorrow(gappy)) & 0xff); rt.byteVecPush(out, unwrapOr$0r2bmpr(rt.iterToOption(gappy.next()), 238)); const calls: rt.ByteVec = new rt.ByteVec(); diff --git a/ts/fixtures/lang/expected/strs.ts b/ts/fixtures/lang/expected/strs.ts index 1ee92426e..7855abe5c 100644 --- a/ts/fixtures/lang/expected/strs.ts +++ b/ts/fixtures/lang/expected/strs.ts @@ -1197,7 +1197,7 @@ export function iters(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { put(out, rt.stringExtendChars("", rt.iterSlice(chars))); put(out, rt.stringExtendChars("", rt.iterSkip(rt.iterSlice(chars), 1))); rt.iterEmpty(); - put(out, rt.stringExtendChars("", rt.iterEmpty())); + put(out, rt.stringExtendChars("", rt.iterEmpty() as rt.Iter)); put(out, rt.stringExtendChars("", rt.iterOption(rt.charFromU32(kind as rt.u32)))); put(out, rt.stringExtendChars("", rt.iterFrom({ items: chars, nexts }, (it: Counted.Counted) => Counted.next$Iterator_char(it)))); } else if (_21 === 1) { @@ -1213,7 +1213,7 @@ export function iters(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { return !((p5.length === 0)); }))); rt.iterEmpty(); - put(out, rt.stringFromStrings(rt.iterEmpty())); + put(out, rt.stringFromStrings(rt.iterEmpty() as rt.Iter)); put(out, rt.stringExtendChars("", rt.iterRev(rt.strChars(s)))); put(out, rt.stringExtend("", rt.iterSlice(parts))); const owned: string[] = rt.iterToArray(rt.iterMap(rt.iterSlice(parts), (p6: string): string => { @@ -1231,7 +1231,7 @@ export function iters(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { t = rt.stringExtendChars(t, _157); named.name = rt.stringExtendChars(named.name, rt.iterSlice(chars)); rt.iterEmpty(); - named.name = rt.stringExtendChars(named.name, rt.iterEmpty()); + named.name = rt.stringExtendChars(named.name, rt.iterEmpty() as rt.Iter); const counted3: Counted.Counted = { items: chars, nexts }; t = rt.stringExtendChars(t, rt.iterFrom(counted3, (it: Counted.Counted) => Counted.next$Iterator_char(it))); put(out, t); @@ -1251,7 +1251,7 @@ export function iters(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { }); named.name = rt.stringExtend(named.name, _197); rt.iterEmpty(); - named.name = rt.stringExtend(named.name, rt.iterEmpty()); + named.name = rt.stringExtend(named.name, rt.iterEmpty() as rt.Iter); const counted4: Counted.Counted = { items: parts, nexts }; t2 = rt.stringExtend(t2, rt.iterFrom(counted4, (it: Counted.Counted) => Counted.next$Iterator_str(it))); put(out, t2); diff --git a/ts/fixtures/lang/expected/zeros.Both.ts b/ts/fixtures/lang/expected/zeros.Both.ts new file mode 100644 index 000000000..622016acf --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.Both.ts @@ -0,0 +1,28 @@ +// Generated by rust2-ts. Do not edit. + +import { log } from "./zeros.ts"; +import type * as Loud from "./zeros.Loud.ts"; +import type * as Quiet from "./zeros.Quiet.ts"; + +/** Drops itself, then its fields in order. */ +export class Both { + _0: Loud.Loud; + _1: Quiet.Quiet; + + constructor(_0: Loud.Loud, _1: Quiet.Quiet) { + this._0 = _0; + this._1 = _1; + } + + [Symbol.dispose](): void { + drop$Drop(this); + this._0[Symbol.dispose](); + this._1[Symbol.dispose](); + } +} + +export function drop$Drop(_self: Both): void { + log(3); +} + +//# sourceMappingURL=zeros.Both.ts.map diff --git a/ts/fixtures/lang/expected/zeros.Holds.ts b/ts/fixtures/lang/expected/zeros.Holds.ts new file mode 100644 index 000000000..772b49193 --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.Holds.ts @@ -0,0 +1,12 @@ +// Generated by rust2-ts. Do not edit. + +/** A closure it holds, zero-sized when the closure captures nothing. */ +export class Holds { + _0: F; + + constructor(_0: F) { + this._0 = _0; + } +} + +//# sourceMappingURL=zeros.Holds.ts.map diff --git a/ts/fixtures/lang/expected/zeros.Loud.ts b/ts/fixtures/lang/expected/zeros.Loud.ts new file mode 100644 index 000000000..13298f06e --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.Loud.ts @@ -0,0 +1,16 @@ +// Generated by rust2-ts. Do not edit. + +import { log } from "./zeros.ts"; + +export class Loud { + + [Symbol.dispose](): void { + drop$Drop(this); + } +} + +export function drop$Drop(_self: Loud): void { + log(1); +} + +//# sourceMappingURL=zeros.Loud.ts.map diff --git a/ts/fixtures/lang/expected/zeros.One.ts b/ts/fixtures/lang/expected/zeros.One.ts new file mode 100644 index 000000000..1ef98d598 --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.One.ts @@ -0,0 +1,20 @@ +// Generated by rust2-ts. Do not edit. + +import * as rt from "./rt.ts"; + +export function clone$Clone(_self: One): One { + return "Only" as One; +} + +export function fmt$Debug(_self: One, f: rt.Formatter): rt.Result { + return rt.fmtWriteStr(f, "Only"); +} + +export function eq$PartialEq(_self: One, _other: One): boolean { + return true; +} + +/** Of one variant, so zero-sized. */ +export type One = "Only"; + +//# sourceMappingURL=zeros.One.ts.map diff --git a/ts/fixtures/lang/expected/zeros.Pair.ts b/ts/fixtures/lang/expected/zeros.Pair.ts new file mode 100644 index 000000000..11f6dfc91 --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.Pair.ts @@ -0,0 +1,15 @@ +// Generated by rust2-ts. Do not edit. + +import type * as Unit from "./zeros.Unit.ts"; + +export function clone$Clone(_self: Pair): Pair { + return { _0: {}, _1: undefined }; +} + +/** Of zero-sized fields, so zero-sized too. */ +export interface Pair { + _0: Unit.Unit; + _1: undefined; +} + +//# sourceMappingURL=zeros.Pair.ts.map diff --git a/ts/fixtures/lang/expected/zeros.Quiet.ts b/ts/fixtures/lang/expected/zeros.Quiet.ts new file mode 100644 index 000000000..a2806d14e --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.Quiet.ts @@ -0,0 +1,16 @@ +// Generated by rust2-ts. Do not edit. + +import { log } from "./zeros.ts"; + +export class Quiet { + + [Symbol.dispose](): void { + drop$Drop(this); + } +} + +export function drop$Drop(_self: Quiet): void { + log(2); +} + +//# sourceMappingURL=zeros.Quiet.ts.map diff --git a/ts/fixtures/lang/expected/zeros.Unit.ts b/ts/fixtures/lang/expected/zeros.Unit.ts new file mode 100644 index 000000000..fb4e54646 --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.Unit.ts @@ -0,0 +1,24 @@ +// Generated by rust2-ts. Do not edit. + +import * as rt from "./rt.ts"; + +export function clone$Clone(_self: Unit): Unit { + return {}; +} + +export function fmt$Debug(_self: Unit, f: rt.Formatter): rt.Result { + return rt.fmtWriteStr(f, "Unit"); +} + +export function default$Default(): Unit { + return {}; +} + +export function eq$PartialEq(_self: Unit, _other: Unit): boolean { + return true; +} + +export interface Unit { +} + +//# sourceMappingURL=zeros.Unit.ts.map diff --git a/ts/fixtures/lang/expected/zeros.ts b/ts/fixtures/lang/expected/zeros.ts new file mode 100644 index 000000000..b87d10eb6 --- /dev/null +++ b/ts/fixtures/lang/expected/zeros.ts @@ -0,0 +1,181 @@ +// Generated by rust2-ts. Do not edit. + +import * as rt from "./rt.ts"; +import * as Both from "./zeros.Both.ts"; +import * as Holds from "./zeros.Holds.ts"; +import * as Loud from "./zeros.Loud.ts"; +import * as One from "./zeros.One.ts"; +import * as Pair from "./zeros.Pair.ts"; +import * as Quiet from "./zeros.Quiet.ts"; +import * as Unit from "./zeros.Unit.ts"; + +export const LOG: rt.Atomic = /* @__PURE__ */ new rt.Atomic(0); + +export function log(tag: rt.u32): void { + rt.atomicStore(LOG, (((rt.atomicLoad(LOG, 0) << 4) >>> 0) | tag) >>> 0, 0); +} + +export function unit(): Unit.Unit { + return {}; +} + +export function pair(): Pair.Pair { + return { _0: {}, _1: undefined }; +} + +export function none$String(): string[] { + return []; +} + +export function units(): Unit.Unit[] { + return [{}, {}, {}]; +} + +export function one(): One.One { + return "Only" as One.One; +} + +export function tuple(): [undefined, Unit.Unit, Uint8Array] { + return [undefined, {}, Uint8Array.of()] as [undefined, Unit.Unit, Uint8Array]; +} + +export function phantom$u8(): undefined { + return undefined; +} + +export function adder(): (a0: rt.u8) => rt.u8 { + return (b: rt.u8): rt.u8 => { + return rt.u8WrappingAdd(b, 1); + }; +} + +export function loud(): Loud.Loud { + return new Loud.Loud(); +} + +export function made$Unit(): Unit.Unit { + return Unit.default$Default(); +} + +/** The case `kind` picks, on `data`; each puts what it read. */ +export function zeros(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { + const _72: (a0: rt.u8) => One.One = (_2: rt.u8): One.One => { + return "Only" as One.One; + }; + rt.atomicStore(LOG, 0, 0); + const n: rt.usize = data.length; + const _8: rt.u8 = rt.u8Rem(kind, 7); + if (_8 === 0) { + const _11: Unit.Unit = Unit.clone$Clone({}); + const _13: Pair.Pair = Pair.clone$Clone(pair()); + const _16: Unit.Unit = made$Unit(); + phantom$u8(); + rt.byteVecPush(out, ((Unit.eq$PartialEq(_11, {}) ? 1 : 0)) | ((((Unit.eq$PartialEq(_13._0, _16) ? 1 : 0)) << 1) & 0xff)); + const _40: One.One = One.clone$Clone("Only" as One.One); + const args2: rt.Fmt[] = [(f: rt.Formatter) => Unit.fmt$Debug(_11, f), (f: rt.Formatter) => One.fmt$Debug(_40, f)]; + rt.iterExtendBytes(out, rt.strBytes(rt.fmtFormat([args2[0], " ", args2[1]])), undefined, true); + } else if (_8 === 1) { + rt.byteVecPush(out, rt.iterCount(rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_213: rt.u8): Uint8Array => { + return Uint8Array.of(); + })) & 0xff); + rt.byteVecPush(out, rt.iterToArray(rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_214: rt.u8): Unit.Unit => { + return {}; + }), undefined, 0, true).length & 0xff); + rt.byteVecPush(out, rt.iterCount(rt.iterFlatten(rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_215: rt.u8): Unit.Unit[] => { + return [{}, {}, {}]; + }), (value: Unit.Unit[]) => rt.iterSlice(value), false, 3)) & 0xff); + rt.byteVecPush(out, rt.iterCount(rt.iterFilter(rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_216: rt.u8): Pair.Pair => { + return pair(); + }), (p: Pair.Pair): boolean => { + return Unit.eq$PartialEq(p._0, { _0: {}, _1: undefined }._0); + })) & 0xff); + rt.byteVecPush(out, One.eq$PartialEq(_72(1), one()) ? 1 : 0); + } else if (_8 === 2) { + const _87: Unit.Unit = unit(); + const _89: string[] = none$String(); + const _91: Unit.Unit[] = units(); + const _93: One.One = one(); + const _95: [undefined, Unit.Unit, Uint8Array] = tuple(); + const args4: rt.Fmt[] = [(f: rt.Formatter) => Unit.fmt$Debug(_87, f), (f: rt.Formatter) => rt.fmtList(_89, f, rt.fmtStr), (f: rt.Formatter) => rt.fmtList(_91, f, (value: Unit.Unit, f: rt.Formatter) => Unit.fmt$Debug(value, f)), (f: rt.Formatter) => One.fmt$Debug(_93, f), (f: rt.Formatter) => rt.fmtTuple([(f: rt.Formatter) => rt.fmtUnit(_95[0], f), (f: rt.Formatter) => Unit.fmt$Debug(_95[1], f), (f: rt.Formatter) => rt.fmtList(_95[2], f, rt.u8Debug)], f)]; + rt.iterExtendBytes(out, rt.strBytes(rt.fmtFormat([args4[0], " ", args4[1], " ", args4[2], " ", args4[3], " ", args4[4]])), undefined, true); + } else if (_8 === 3) { + const _108: (a0: rt.u8) => rt.u8 = adder(); + adder(); + rt.iterExtendBytes(out, rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_211: rt.u8): rt.u8 => { + return _108(_211); + }), undefined, true); + rt.iterExtendBytes(out, rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (b5: rt.u8): rt.u8 => { + return rt.u8WrappingAdd(b5, 1); + }), undefined, true); + const _122: rt.Iter = rt.iterSlice(rt.byteSliceView(data)); + adder(); + rt.iterExtendBytes(out, rt.iterMap(_122, (b6: rt.u8): rt.u8 => { + return rt.u8WrappingAdd(b6, 1); + }), undefined, true); + rt.iterExtendBytes(out, rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_212: rt.u8): rt.u8 => { + return new Holds.Holds((b: rt.u8): rt.u8 => { + return b ^ 90; + })._0(_212); + }), undefined, true); + } else if (_8 === 4) { + new Quiet.Quiet()[Symbol.dispose](); + new Loud.Loud()[Symbol.dispose](); + loud(); + new Loud.Loud()[Symbol.dispose](); + const v: Loud.Loud[] = rt.iterToArray(rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_210: rt.u8): Loud.Loud => { + return new Loud.Loud(); + }), undefined, 0, true); + rt.byteVecPush(out, v.length & 0xff); + rt.dropAll(v); + new Both.Both(new Loud.Loud(), new Quiet.Quiet())[Symbol.dispose](); + new Quiet.Quiet()[Symbol.dispose](); + rt.dropAll([new Quiet.Quiet(), new Quiet.Quiet()]); + rt.iterExtendBytes(out, rt.iterSlice(rt.u32ToBeBytes(rt.atomicLoad(LOG, 0))), undefined, true); + } else if (_8 === 5) { + const v2: undefined[] = []; + const _154: rt.Iter = rt.iterMap(rt.iterSlice(rt.byteSliceView(data)), (_28: rt.u8): undefined => {}); + rt.iterExtend(v2, _154, undefined, 0, true); + rt.byteVecPush(out, rt.vecFromElem({}, n, undefined).length & 0xff); + rt.byteVecPush(out, v2.length & 0xff); + } else { + rt.iterFromFn((): rt.u8 | undefined => { + return undefined; + }); + rt.byteVecPush(out, rt.iterCount(rt.iterFromFn((): rt.u8 | undefined => { + return undefined; + })) & 0xff); + rt.iterFromFn((): Unit.Unit | undefined => { + return {}; + }); + rt.byteVecPush(out, rt.iterCount(rt.iterTake(rt.iterFromFn((): Unit.Unit | undefined => { + return {}; + }), n)) & 0xff); + let captured = n; + rt.iterExtendBytes(out, rt.iterFromFn((): rt.u8 | undefined => { + const _22: rt.usize | undefined = rt.usizeCheckedSub(captured, 1); + if (_22 !== undefined) { + captured = _22; + return captured & 0xff; + } + return undefined; + })); + rt.iterEmpty(); + rt.byteVecPush(out, rt.iterMap(rt.iterEmpty() as rt.Iter, (b2: rt.u8): rt.u8 => { + return rt.u8Add(b2, 1); + }).sizeHint()[0] & 0xff); + rt.byteVecPush(out, rt.iterCount(rt.iterMap(rt.iterEmpty() as rt.Iter, (b3: rt.u8): rt.u8 => { + return rt.u8Add(b3, 1); + })) & 0xff); + rt.iterEmpty(); + rt.iterEmpty() as rt.Iter; + rt.iterRev(rt.iterEmpty() as rt.Iter); + rt.iterFilter(rt.iterRev(rt.iterEmpty() as rt.Iter), (_23: rt.u8): boolean => { + return true; + }); + rt.byteVecPush(out, rt.iterCount(rt.iterFilter(rt.iterRev(rt.iterEmpty() as rt.Iter), (_27: rt.u8): boolean => { + return true; + })) & 0xff); + } +} + +//# sourceMappingURL=zeros.ts.map diff --git a/ts/fixtures/lang/src/harness.rs b/ts/fixtures/lang/src/harness.rs index 18315797a..3dd430e17 100644 --- a/ts/fixtures/lang/src/harness.rs +++ b/ts/fixtures/lang/src/harness.rs @@ -4,7 +4,7 @@ use crate::{ arrays, atomics, borrows, bounds, captures, cells, chars, chunks, collections, combinators, counts, cows, defaults, durations, dyns, edits, errors, floats, fmt, generics, hashes, hints, holds, ints, iters, keys, locals, locks, - nested, objects, orders, pointers, refs, shapes, singles, slices, splits, statics, strs, utf8, wrappers, + nested, objects, orders, pointers, refs, shapes, singles, slices, splits, statics, strs, utf8, wrappers, zeros, }; /// The native side's entry: [`run`], except that a case starting with 0xff prints a @@ -163,6 +163,7 @@ fn cases() -> Vec<(&'static str, Case)> { ("iters::peeked_others", |_, data, out| iters::peeked_others(data, out)), ("hints::hints", hints::hints), ("hints::reserves", hints::reserves), + ("zeros::zeros", zeros::zeros), ] } diff --git a/ts/fixtures/lang/src/hints.rs b/ts/fixtures/lang/src/hints.rs index 47bbc2e75..19cb86ea3 100644 --- a/ts/fixtures/lang/src/hints.rs +++ b/ts/fixtures/lang/src/hints.rs @@ -175,13 +175,16 @@ pub fn hints(kind: u8, data: &[u8], out: &mut Vec) { few.peek(); put(out, few.size_hint()); } - // Flattens of arrays, whose length counts, of iterators that may hold any number, - // and of ones that hold at most one, which std's hint specializes on. - 12 => match arm % 5 { + // Flattens of arrays, whose length counts, empty ones too, of iterators that may + // hold any number, and of ones that hold at most one, which std's hint specializes on. + 12 => match arm % 7 { 0 => walk((0..n).map(|i| [i; 3]).flatten(), steps, out), 1 => walk((0..n).flat_map(|i| [i]), steps, out), 2 => walk(bytes.chunks(2).flatten(), steps, out), 3 => walk((0..n.min(9)).map(|i| 0..i).flatten(), steps, out), + // Reading one reads every empty array, so only a few, and the hint alone of more. + 5 => walk((0..n.min(9)).map(|_| [0u8; 0]).flatten(), steps, out), + 6 => put(out, (0..n).flat_map(|i| [i; 0]).size_hint()), _ => walk((0..n).flat_map(|i| [[i; 2]; 2].into_iter().flatten()), steps, out), }, 13 => match arm % 6 { @@ -208,7 +211,9 @@ pub fn hints(kind: u8, data: &[u8], out: &mut Vec) { 4 => walk(std::iter::once(n), steps, out), _ => walk(std::iter::empty::(), steps, out), }, - 15 => match arm % 5 { + // `from_fn`'s of a closure that captures something, and of one that captures nothing. + 15 => match arm % 6 { + 5 => walk_front(std::iter::from_fn(|| None::), steps, out), 0 => walk_front(std::iter::successors(Some(n % 4), |&i| i.checked_sub(1)), steps, out), 1 => walk_front(std::iter::successors(None::, |&i| Some(i)), steps, out), 2 => walk_front(Countdown(n as u8), steps, out), @@ -333,7 +338,7 @@ const COLLECTIONS: u8 = 13; /// a `TrustedLen` iterator, and after the first of another, which it reserves for again /// whenever it fills. pub fn reserves(kind: u8, data: &[u8], out: &mut Vec) { - match kind / COLLECTIONS % 5 { + match kind / COLLECTIONS % 6 { 0 => typed( kind, data, @@ -382,6 +387,19 @@ pub fn reserves(kind: u8, data: &[u8], out: &mut Vec) { }, out, ), + // Zero-sized, of which a `Vec` holds `usize::MAX`. + 5 => typed( + kind, + data, + |_| Unit, + Most { + vec: 0xffff_ffff, + pairs: 0x1fff_ffff, + set: 0x1fff_ffff, + map: 0x0e00_0000, + }, + out, + ), _ => typed( kind, data, @@ -401,6 +419,10 @@ pub fn reserves(kind: u8, data: &[u8], out: &mut Vec) { #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] struct Big([u32; 275]); +/// Zero-sized, whose derived `clone` assigns nothing. +#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] +struct Unit; + /// `reserves` of elements `make` makes. fn typed T>(kind: u8, data: &[u8], make: F, most: Most, out: &mut Vec) { let at = |i: usize| data.get(i).copied().unwrap_or(0); diff --git a/ts/fixtures/lang/src/lib.rs b/ts/fixtures/lang/src/lib.rs index 21d2eae31..e8b8c1c57 100644 --- a/ts/fixtures/lang/src/lib.rs +++ b/ts/fixtures/lang/src/lib.rs @@ -13,7 +13,8 @@ //! mutable ones written through, their parts by inclusive and checked ranges and by fixed //! size, `Vec::drain`, the order, equality, and hashes of bytes, ranges of `Bound`s and of //! the crate's own `RangeBounds`, the equality of `Result`s and std's errors, iterators' -//! size hints, and the capacity overflows collections reserving by them panic with. +//! size hints, the capacity overflows collections reserving by them panic with, and +//! zero-sized values, which MIR never assigns. //! //! `harness::run` is the entry point both sides of the differential test run, and //! `fmt::Fault` an error only `caller.ts` prints. @@ -63,5 +64,6 @@ mod utf8; #[path = "../../wasm.rs"] mod wasm; mod wrappers; +mod zeros; #[cfg(target_arch = "wasm32")] use harness::entry; diff --git a/ts/fixtures/lang/src/zeros.rs b/ts/fixtures/lang/src/zeros.rs new file mode 100644 index 000000000..8934b8100 --- /dev/null +++ b/ts/fixtures/lang/src/zeros.rs @@ -0,0 +1,188 @@ +//! Zero-sized values, which MIR never assigns and reads as constants: unit structs, empty +//! arrays and arrays of zero-sized elements, structs of zero-sized fields, enums of one +//! variant, `PhantomData`, closures that capture nothing, and std's iterators made of +//! them, as results, as values, in collections, and as they drop. + +use std::marker::PhantomData; +use std::sync::atomic::{AtomicU32, Ordering::Relaxed}; + +#[derive(Clone, Copy, Debug, Default, PartialEq)] +struct Unit; + +/// Of zero-sized fields, so zero-sized too. +#[derive(Clone, Copy)] +struct Pair(Unit, PhantomData); + +/// Of one variant, so zero-sized. +#[derive(Clone, Copy, Debug, PartialEq)] +enum One { + Only, +} + +/// A closure it holds, zero-sized when the closure captures nothing. +struct Holds(F); + +/// What dropped, four bits each, the latest lowest. +static LOG: AtomicU32 = AtomicU32::new(0); + +fn log(tag: u32) { + LOG.store(LOG.load(Relaxed) << 4 | tag, Relaxed); +} + +struct Loud; + +impl Drop for Loud { + fn drop(&mut self) { + log(1); + } +} + +struct Quiet; + +impl Drop for Quiet { + fn drop(&mut self) { + log(2); + } +} + +/// Drops itself, then its fields in order. +struct Both(Loud, Quiet); + +impl Drop for Both { + fn drop(&mut self) { + log(3); + } +} + +fn unit() -> Unit { + Unit +} + +fn pair() -> Pair { + Pair(Unit, PhantomData) +} + +fn none() -> [T; 0] { + [] +} + +fn units() -> [Unit; 3] { + [Unit; 3] +} + +fn one() -> One { + One::Only +} + +fn tuple() -> ((), Unit, [u8; 0]) { + ((), Unit, []) +} + +fn phantom() -> PhantomData { + PhantomData +} + +fn adder() -> impl Fn(u8) -> u8 { + |b| b.wrapping_add(1) +} + +fn loud() -> Loud { + Loud +} + +fn made() -> T { + T::default() +} + +/// The case `kind` picks, on `data`; each puts what it read. +pub fn zeros(kind: u8, data: &[u8], out: &mut Vec) { + LOG.store(0, Relaxed); + let n = data.len(); + match kind % 7 { + // Derived and written impls whose results nothing assigns. + 0 => { + let u = Unit; + let c = u.clone(); + let p = pair().clone(); + let q: Unit = made(); + let _: PhantomData = phantom(); + out.push(u8::from(c == u) | u8::from(p.0 == q) << 1); + out.extend(format!("{c:?} {:?}", One::Only.clone()).bytes()); + } + // Closures that return them, read as items. + 1 => { + out.push(data.iter().map(|_| [0u8; 0]).count() as u8); + out.push(data.iter().map(|_| Unit).collect::>().len() as u8); + out.push(data.iter().map(|_| [Unit; 3]).flatten().count() as u8); + out.push( + data.iter() + .map(|_| pair()) + .filter(|p| p.0 == Pair(Unit, PhantomData).0) + .count() as u8, + ); + let f = |_: u8| One::Only; + out.push(u8::from(f(1) == one())); + } + 2 => { + let s = format!( + "{:?} {:?} {:?} {:?} {:?}", + unit(), + none::(), + units(), + one(), + tuple() + ); + out.extend(s.bytes()); + } + // Closures that capture nothing as values: returned, moved, and held in a field. + 3 => { + let f = adder(); + let g = adder(); + let h = g; + let held = Holds(|b: u8| b ^ 0x5a); + out.extend(data.iter().map(|&b| f(b))); + out.extend(data.iter().copied().map(h)); + out.extend(data.iter().copied().map(adder())); + out.extend(data.iter().map(|&b| (held.0)(b))); + } + // Drops, in order: of locals, a result, a `Vec`'s items, a struct's fields after it, + // a moved value, and an array's items, but not of what's forgotten. + 4 => { + { + let _a = Loud; + let _b = Quiet; + } + drop(loud()); + let v: Vec = data.iter().map(|_| Loud).collect(); + out.push(v.len() as u8); + drop(v); + drop(Both(Loud, Quiet)); + std::mem::forget(Loud); + let x = Quiet; + let y = x; + drop(y); + drop([Quiet, Quiet]); + out.extend(LOG.load(Relaxed).to_be_bytes()); + } + 5 => { + let mut v: Vec<()> = Vec::with_capacity(n); + v.extend(data.iter().map(|_| ())); + out.push(vec![Unit; n].len() as u8); + out.push(v.len() as u8); + } + // std's iterators of zero-sized fields, beside one that captures. + _ => { + out.push(std::iter::from_fn(|| None::).count() as u8); + out.push(std::iter::from_fn(|| Some(Unit)).take(n).count() as u8); + let mut left = n; + out.extend(std::iter::from_fn(move || { + left = left.checked_sub(1)?; + Some(left as u8) + })); + let empty = std::iter::empty::().map(|b| b + 1); + out.push(empty.size_hint().0 as u8); + out.push(empty.count() as u8); + out.push(std::iter::empty::<&u8>().copied().rev().filter(|_| true).count() as u8); + } + } +} diff --git a/ts/runtime/rt/collections.ts b/ts/runtime/rt/collections.ts index 4318f0512..ebf6adb24 100644 --- a/ts/runtime/rt/collections.ts +++ b/ts/runtime/rt/collections.ts @@ -29,6 +29,7 @@ import { rangeInclusiveStartBound, type SizeHint, type Take, + dequeReserve, vecCapacity, vecGrow, vecReserveExact, @@ -758,15 +759,18 @@ function extending(c: C, items: Iter, add: (item: T) => void, take?: Ta /** * `extending` a `Vec` or `VecDeque` holding `len`, which with elements `size` bytes each - * reserves as `iterExtend` does: a `trusted` iterator up front, and any other by `next`. + * reserves as `iterExtend` does: a `trusted` iterator up front, and any other by `next`, + * a `deque`'s at its first item too. */ -function vecExtending(c: C, len: number, items: Iter, add: (item: T) => void, take?: Take, size?: number, trusted = false): C { +function vecExtending(c: C, len: number, items: Iter, add: (item: T) => void, take?: Take, size?: number, trusted = false, deque = false): C { if (size === undefined || trusted) { if (size !== undefined) vecReserveExact(items, len, size); return extending(c, items, add, take); } let cap = vecCapacity(len, size); for (let item = items.next(); item !== DONE; item = items.next()) { + if (deque) dequeReserve(items, len); + deque = false; if (len === cap) cap = vecGrow(items, cap, size); add(item); len++; @@ -2230,7 +2234,7 @@ class ByteVecDrain extends Iter implements Disposable { * says and reserves as `iterExtend` does. */ export function dequeExtend(q: VecDeque, items: Iter, take?: Take, size?: number, trusted = false): VecDeque { - return vecExtending(q, q.n, items, (item) => dequePushBack(q, item), take, size, trusted); + return vecExtending(q, q.n, items, (item) => dequePushBack(q, item), take, size, trusted, true); } /** `clone`, with each item through its `Clone`, or as itself without one. */ diff --git a/ts/runtime/rt/iter.ts b/ts/runtime/rt/iter.ts index 7f968dd75..636e6e96e 100644 --- a/ts/runtime/rt/iter.ts +++ b/ts/runtime/rt/iter.ts @@ -429,6 +429,15 @@ export function vecGrow(it: Iter, cap: number, size: number): number { return grown; } +/** + * The reserve std's `VecDeque` makes at the first item it extends by, holding `len`, for + * what `it` holds past it, which panics past `usize::MAX` even where its zero-sized + * elements never fill it. + */ +export function dequeReserve(it: Iter, len: number): void { + if (len + satAdd(it.sizeHint()[0], 1) > USIZE_MAX) panic("capacity overflow"); +} + /** * `Extend::extend` of a `Vec`, which takes `items` as `take` says, and with elements * `size` bytes each, reserves as std's does for a `trusted`, `TrustedLen`, iterator or any diff --git a/ts/src/lower/body.rs b/ts/src/lower/body.rs index 72f9d98c5..cd2e10cec 100644 --- a/ts/src/lower/body.rs +++ b/ts/src/lower/body.rs @@ -222,6 +222,38 @@ impl<'b, 'a, 'tcx> Body<'b, 'a, 'tcx> { } } + /// A value of one of std's types made of zero-sized `values`, which MIR reads as a + /// constant rather than from what made it, or `values` back for another type. + pub fn zero_sized_std(&mut self, ty: Ty<'tcx>, values: Vec, span: Span) -> Result> { + let tcx = self.t.tcx; + let ty::Adt(adt, _) = ty.kind() else { + return Err(values); + }; + match library::std_path(tcx, adt.did()) + .iter() + .map(String::as_str) + .collect::>() + .as_slice() + { + ["marker", "PhantomData"] => return Ok(Expr::undefined()), + // Typed, as what reads it may infer nothing of it. + ["iter", "sources", "empty", "Empty"] => { + let ts_ty = self.t.ty(ty, span); + return Ok(Expr::As(Box::new(Expr::rt("iterEmpty", Vec::new())), ts_ty)); + } + _ => {} + } + let Some((make, gargs)) = super::iter::maker(self.t, ty) else { + return Err(values); + }; + let mut pre = Vec::new(); + let made = self.call_def(make, gargs, values, span, &mut pre); + Ok(match pre.is_empty() { + true => made, + false => self.err(span, format!("a constant of type `{ty}` whose making takes statements")), + }) + } + /// A function item as a value, typed as one: a declared function's `()` result is `void`, /// which a value's type says is `undefined`. pub fn fn_value(&mut self, def_id: rustc_hir::def_id::DefId, gargs: GenericArgsRef<'tcx>, span: Span) -> Expr { diff --git a/ts/src/lower/consts.rs b/ts/src/lower/consts.rs index 2217659a5..799efb467 100644 --- a/ts/src/lower/consts.rs +++ b/ts/src/lower/consts.rs @@ -158,6 +158,10 @@ impl<'b, 'a, 'tcx> Body<'b, 'a, 'tcx> { _ => self.err(span, format!("a constant of type `{ty}`")), }; } + let values = match self.zero_sized_std(ty, values, span) { + Ok(made) => return made, + Err(values) => values, + }; if !self.t.own(adt.did()) { let foreign = self.t.foreign(adt.did()); return self.err(span, format!("a constant of type `{ty}` {foreign}")); diff --git a/ts/src/lower/iter.rs b/ts/src/lower/iter.rs index 315d3740f..3c2a8641b 100644 --- a/ts/src/lower/iter.rs +++ b/ts/src/lower/iter.rs @@ -743,6 +743,78 @@ fn std_iter_path(tcx: ty::TyCtxt<'_>, ty: Ty<'_>) -> Option> { Some(library::std_path(tcx, adt.did())).filter(|p| !p.is_empty()) } +/// The function or `Iterator` method named for `ty`, one of std's iterators of zero-sized +/// fields, as `from_fn` makes a `FromFn` and `map` a `Map`, and its generic arguments: what +/// MIR reads as a constant, rather than from that call, makes it of its fields in order. +pub(super) fn maker<'tcx>(t: &Translator<'_, 'tcx>, ty: Ty<'tcx>) -> Option<(DefId, ty::GenericArgsRef<'tcx>)> { + let tcx = t.tcx; + let ty::Adt(adt, args) = ty.kind() else { + return None; + }; + if !library::is_std(tcx, adt.did()) || !adt.is_struct() || !t.zero_sized(ty) { + return None; + } + let item = t.iter_item(ty)?; + let name = tcx + .item_name(adt.did()) + .as_str() + .chars() + .enumerate() + .fold(String::new(), |mut name, (i, c)| { + if c.is_uppercase() && i > 0 { + name.push('_'); + } + name.extend(c.to_lowercase()); + name + }); + let iterator = tcx.get_diagnostic_item(rustc_span::sym::Iterator)?; + let method = (tcx.associated_items(iterator)) + .filter_by_name_unhygienic(rustc_span::Symbol::intern(&name)) + .find(|i| i.is_fn()) + .map(|i| i.def_id); + let make = method.or_else(|| super::bind::resolve_in(tcx, tcx.parent(adt.did()), &[&name]))?; + if !matches!( + tcx.def_kind(make), + rustc_hir::def::DefKind::Fn | rustc_hir::def::DefKind::AssocFn + ) || ty::GenericArgs::identity_for_item(tcx, make).consts().next().is_some() + { + return None; + } + // What its result names, and the item for what it doesn't, as `map`'s `B` is. + let output = tcx + .fn_sig(make) + .instantiate_identity() + .skip_norm_wip() + .skip_binder() + .output(); + let mut found = Vec::new(); + bind_params(output, ty, &mut found); + let gargs = ty::GenericArgs::for_item(tcx, make, |param, _| match param.kind { + ty::GenericParamDefKind::Lifetime => tcx.lifetimes.re_erased.into(), + _ => (found.iter()) + .find(|&&(index, _)| index == param.index) + .map_or(item, |&(_, ty)| ty) + .into(), + }); + let sig = tcx.fn_sig(make).instantiate(tcx, gargs).skip_norm_wip(); + let sig = tcx.instantiate_bound_regions_with_erased(sig); + let fields = adt.non_enum_variant().fields.iter().map(|f| t.field_ty(f.did, args)); + (sig.output() == ty && sig.inputs().iter().copied().eq(fields)).then_some((make, gargs)) +} + +/// The type parameters `pattern` names, with what `ty` has in their place. +fn bind_params<'tcx>(pattern: Ty<'tcx>, ty: Ty<'tcx>, found: &mut Vec<(u32, Ty<'tcx>)>) { + match (pattern.kind(), ty.kind()) { + (ty::Param(param), _) => found.push((param.index, ty)), + (ty::Adt(a, pattern_args), ty::Adt(b, args)) if a == b => { + for (p, t) in pattern_args.types().zip(args.types()) { + bind_params(p, t, found); + } + } + _ => {} + } +} + /// Whether std's iterator `did` holds a closure that its `rt.Iter` drops after the iterator /// it wraps, as std's fields order them. pub(super) fn holds_closure(tcx: ty::TyCtxt<'_>, did: DefId) -> bool { diff --git a/ts/src/lower/mir/mod.rs b/ts/src/lower/mir/mod.rs index 5f4861268..7149bec68 100644 --- a/ts/src/lower/mir/mod.rs +++ b/ts/src/lower/mir/mod.rs @@ -828,40 +828,20 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { } } - /// A struct of no fields or an empty array that nothing assigns, which MIR leaves - /// unassigned since it holds nothing: JS needs it made, as the crate's or as std's - /// `fmt::Error` and `ParseBoolError` are. + /// A zero-sized value that nothing assigns, the result included, which MIR leaves + /// unassigned since it holds nothing: JS needs it made, as a constant of it is. A + /// closure's is declared once instead, in [`Self::lower`]. fn unassigned(&mut self, local: Local, ty: Ty<'tcx>) -> Option { - if self.defs[local] != 0 || self.is_arg(local) || local == mir::RETURN_PLACE { + if self.defs[local] != 0 || self.is_arg(local) || self.uses[local] == 0 || ty.is_closure() { return None; } - if let ty::Array(elem, len) = ty.kind() - && len.try_to_target_usize(self.tcx) == Some(0) - { - return Some(match elem.kind() { - ty::Uint(ty::UintTy::U8) => Expr::ident("Uint8Array").member("of").call(Vec::new()), - _ => Expr::As( - Box::new(Expr::Array(Vec::new())), - self.b.t.ty(ty, self.local_span(local)), - ), - }); - } - let ty::Adt(adt, args) = ty.kind() else { - return None; - }; - if !adt.is_struct() || adt.all_fields().next().is_some() { - return None; - } - use crate::lower::library::Std; - if matches!(Std::of(self.tcx, adt.did()), Some(Std::FmtError | Std::ParseBoolError)) { - let span = self.local_span(local); - return Some(self.adt(adt.did(), rustc_abi::FIRST_VARIANT, args, Vec::new(), ty, span)); - } - if !self.b.t.own(adt.did()) { + let env = self.b.t.typing_env_pub(); + let layout = self.tcx.layout_of(env.as_query_input(ty)).ok()?; + if !layout.is_zst() || layout.is_uninhabited() { return None; } - let info = self.b.t.adt(*adt, self.local_span(local)); - Some(self.b.t.construct(info.sym, &ts::Ctor::Unit, &[], Vec::new())) + let span = self.local_span(local); + Some(self.const_value(mir::ConstValue::ZeroSized, ty, span)) } /// Whether `local` is a box's pointer, as a box's dereference reads it. diff --git a/ts/src/lower/mir/rvalue.rs b/ts/src/lower/mir/rvalue.rs index 8dae649c3..4ecc2d4e4 100644 --- a/ts/src/lower/mir/rvalue.rs +++ b/ts/src/lower/mir/rvalue.rs @@ -614,16 +614,10 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { if super::place::transparent(self.b.t, ty) || crate::lower::library::wrapped(tcx, ty).is_some() { return values.pop().unwrap_or_else(Expr::undefined); } - match crate::lower::library::std_path(tcx, def_id) - .iter() - .map(String::as_str) - .collect::>() - .as_slice() - { - ["marker", "PhantomData"] => return Expr::undefined(), - ["iter", "sources", "empty", "Empty"] => return Expr::rt("iterEmpty", Vec::new()), - _ => {} - } + let values = match self.b.zero_sized_std(ty, values, span) { + Ok(made) => return made, + Err(values) => values, + }; if !self.b.t.own(def_id) { return self.err(span, format!("constructing `{ty}` {}", self.b.t.foreign(def_id))); } From 9e6140b9dc69381cf3b25f9494e39f27f9883396 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Fri, 30 Oct 2026 14:41:17 -0700 Subject: [PATCH 3/4] test(ts): drop the refusals zero-sized constants made of own iterators Co-Authored-By: Claude Opus 5.5 --- ts/fixtures/lang/expected/harness.ts | 3 ++- ts/fixtures/reject/census.md | 15 ++------------- ts/fixtures/reject/expected.txt | 2 -- ts/fixtures/task/expected/model.ts | 3 ++- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/ts/fixtures/lang/expected/harness.ts b/ts/fixtures/lang/expected/harness.ts index d1f263d5c..212488755 100644 --- a/ts/fixtures/lang/expected/harness.ts +++ b/ts/fixtures/lang/expected/harness.ts @@ -42,6 +42,7 @@ import { statics, cells as statics_cells, onces } from "./statics.ts"; import { strs, slices, edits as strs_edits, parses as strs_parses, iters, drains as strs_drains, hinted } from "./strs.ts"; import { decodes } from "./utf8.ts"; import { wrappers } from "./wrappers.ts"; +import { zeros } from "./zeros.ts"; /** * Each case's name and what it runs. The first byte picks one modulo their count, so a @@ -186,7 +187,7 @@ export function cases(): [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) uninhabited(data67, out68); }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["keys::lent_keys", lentKeys as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["keys::lent_values", lentValues as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::singles", singles as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::formats", singles_formats as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::parses", singles_parses as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["iters::peeked_others", (_2168: rt.u8, data68: rt.ByteSlice, out69: rt.ByteVec): undefined => { peekedOthers(data68, out69); - }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::hints", hints as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::reserves", reserves as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["collections::set_ops", setOps as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined]]; + }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::hints", hints as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::reserves", reserves as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["collections::set_ops", setOps as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["zeros::zeros", zeros as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined]]; } /** Run one case. */ diff --git a/ts/fixtures/reject/census.md b/ts/fixtures/reject/census.md index 0d7b84247..da31e844a 100644 --- a/ts/fixtures/reject/census.md +++ b/ts/fixtures/reject/census.md @@ -1,6 +1,6 @@ # Census of `reject-fixture` -- Refusals: 129 +- Refusals: 127 - Function instances: 153 - Generic functions no instance reached, lowered over their type parameters: 10 @@ -25,7 +25,6 @@ | 2 | `_`, a trait object of the generic trait `_`, which is not supported yet | fixtures/reject/src/lib.rs:512:23 | | 2 | a coercion to `_`, which is not supported yet | fixtures/reject/src/lib.rs:503:40 | | 2 | an iterator of the crate implementing `_`, which is not supported yet | fixtures/reject/src/lib.rs:171:1 | -| 2 | constructing `_` from another crate | fixtures/reject/src/lib.rs:157:23 | | 2 | overriding `_`, which std's adaptors call in place of `next` or beside it | fixtures/reject/src/lib.rs:151:2 | | 2 | passing `_`, a closure that owns a value that drops, to `_`, which is not supported yet | fixtures/reject/src/lib.rs:366:13 | | 2 | unsupported type `_` from another crate | fixtures/reject/src/lib.rs:486:32 | @@ -106,7 +105,6 @@ The type or module each refused type or path belongs to. | 2 | `std::any::TypeId` | fixtures/reject/src/lib.rs:593:2 | | 2 | `std::collections::BTreeSet` | fixtures/reject/src/lib.rs:265:75 | | 2 | `std::iter::Iterator` | fixtures/reject/src/lib.rs:244:16 | -| 2 | `std::iter::Map` | fixtures/reject/src/lib.rs:157:23 | | 2 | `std::mem::MaybeUninit` | fixtures/reject/src/lib.rs:1027:19 | | 2 | `std::ops::Range` | fixtures/reject/src/lib.rs:192:8 | | 2 | `std::std` | fixtures/reject/src/lib.rs:622:11 | @@ -148,7 +146,7 @@ The type or module each refused type or path belongs to. | 1 | `std::collections::VecDeque` | fixtures/reject/src/lib.rs:901:27 | | 1 | `std::iter::Chain` | fixtures/reject/src/lib.rs:184:51 | | 1 | `std::iter::Extend` | fixtures/reject/src/lib.rs:1035:6 | -| 1 | `std::iter::Rev` | fixtures/reject/src/lib.rs:178:14 | +| 1 | `std::iter::Map` | fixtures/reject/src/lib.rs:233:30 | | 1 | `std::net::AddrParseError` | fixtures/reject/src/lib.rs:486:32 | | 1 | `std::net::Ipv4Addr` | fixtures/reject/src/lib.rs:486:32 | | 1 | `std::option::Option` | fixtures/reject/src/lib.rs:417:2 | @@ -234,8 +232,6 @@ The type or module each refused type or path belongs to. | 1 | comparing pointers to `_` in an atomic, which JS has no address of | `u32` | fixtures/reject/src/lib.rs:832:15 | | 1 | comparing pointers to `_`, each a place JS makes of its own | `u32` | fixtures/reject/src/lib.rs:651:2 | | 1 | constructing `_` | `std::borrow::Cow` | fixtures/reject/src/lib.rs:397:53 | -| 1 | constructing `_` from another crate | `std::iter::Map` | fixtures/reject/src/lib.rs:157:23 | -| 1 | constructing `_` from another crate | `std::iter::Rev` | fixtures/reject/src/lib.rs:178:14 | | 1 | hashing `_` as a key, which is not supported yet | `std::collections::BTreeSet` | fixtures/reject/src/lib.rs:265:75 | | 1 | hashing `_` through `_`'s own `Hash::hash_slice`, which is not supported yet | `std::vec::Vec`, `Batched` | fixtures/reject/src/lib.rs:357:16 | | 1 | overriding `_`, which std's adaptors call in place of `next` or beside it | `Iterator::fold` | fixtures/reject/src/lib.rs:151:2 | @@ -430,13 +426,6 @@ The type or module each refused type or path belongs to. -
constructing `_` from another crate (2) - -- fixtures/reject/src/lib.rs:157:23: constructing `std::iter::Map` from another crate -- fixtures/reject/src/lib.rs:178:14: constructing `std::iter::Rev` from another crate - -
-
overriding `_`, which std's adaptors call in place of `next` or beside it (2) - fixtures/reject/src/lib.rs:151:2: overriding `Iterator::fold`, which std's adaptors call in place of `next` or beside it diff --git a/ts/fixtures/reject/expected.txt b/ts/fixtures/reject/expected.txt index 86c08214f..621f42f0f 100644 --- a/ts/fixtures/reject/expected.txt +++ b/ts/fixtures/reject/expected.txt @@ -28,8 +28,6 @@ replacing the value behind a reference to `std::pin::Pin>>` at fixtures/reject/src/lib.rs:128:2 replacing the value behind a reference to `std::pin::Pin>` at fixtures/reject/src/lib.rs:120:2 unsupported call to ` as std::iter::Iterator>::cycle` at fixtures/reject/src/lib.rs:138:11 -constructing `std::iter::Map` from another crate at fixtures/reject/src/lib.rs:157:23 -constructing `std::iter::Rev` from another crate at fixtures/reject/src/lib.rs:178:14 a `zip` of `std::iter::Chain, {closure@fixtures/reject/src/lib.rs:184:15: 184:18}>, std::iter::Copied>>`, whose closures std calls one item further through `next` than through `fold` at fixtures/reject/src/lib.rs:184:51 unsupported call to `std::ops::Range::::contains::` at fixtures/reject/src/lib.rs:192:8 a `zip` of `std::iter::Map, {closure@fixtures/reject/src/lib.rs:233:15: 233:19}>` and `std::ops::Range`, which std reads by index, of items that drop, which is not supported yet at fixtures/reject/src/lib.rs:233:30 diff --git a/ts/fixtures/task/expected/model.ts b/ts/fixtures/task/expected/model.ts index 86118ad5f..e81d06a9c 100644 --- a/ts/fixtures/task/expected/model.ts +++ b/ts/fixtures/task/expected/model.ts @@ -1176,7 +1176,8 @@ export function temporaries(log: Log.Log, id: rt.u32): void { Guard.note(head, "head"); Guard.note(rest[1], "rest"); guard(1090)[Symbol.dispose](); - const part2 = ([] as Guard.Guard[]).length; + const _98: Guard.Guard[] = []; + const part2 = _98.length; const args8: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(part2, f)]; Log.note(log, rt.fmtFormat(["empty ", args8[0]])); const captured = guard(1100); From 6b8c12438ffb56cfc81450c317c9fe4bafceb8de Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Fri, 30 Oct 2026 14:54:32 -0700 Subject: [PATCH 4/4] test(ts): update the lang snapshots past #301 Co-Authored-By: Claude Opus 5.5 --- ts/fixtures/lang/expected/harness.ts | 3 +- ts/fixtures/lang/expected/hints.ts | 88 ++++++++++++++-------------- ts/fixtures/lang/expected/zeros.ts | 2 +- 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/ts/fixtures/lang/expected/harness.ts b/ts/fixtures/lang/expected/harness.ts index 8e1d97fd3..33760dc04 100644 --- a/ts/fixtures/lang/expected/harness.ts +++ b/ts/fixtures/lang/expected/harness.ts @@ -43,6 +43,7 @@ import { statics, cells as statics_cells, onces } from "./statics.ts"; import { strs, slices, edits as strs_edits, parses as strs_parses, iters, drains as strs_drains, hinted } from "./strs.ts"; import { decodes } from "./utf8.ts"; import { wrappers } from "./wrappers.ts"; +import { zeros } from "./zeros.ts"; /** * Each case's name and what it runs. The first byte picks one modulo their count, so a @@ -187,7 +188,7 @@ export function cases(): [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) uninhabited(data67, out68); }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["keys::lent_keys", lentKeys as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["keys::lent_values", lentValues as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::singles", singles as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::formats", singles_formats as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["singles::parses", singles_parses as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["iters::peeked_others", (_2168: rt.u8, data68: rt.ByteSlice, out69: rt.ByteVec): undefined => { peekedOthers(data68, out69); - }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::hints", hints as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::reserves", reserves as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["collections::set_ops", setOps as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["folds::folds", folds as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined]]; + }] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::hints", hints as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["hints::reserves", reserves as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["collections::set_ops", setOps as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["folds::folds", folds as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined], ["zeros::zeros", zeros as (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined] as [string, (a0: rt.u8, a1: rt.ByteSlice, a2: rt.ByteVec) => undefined]]; } /** Run one case. */ diff --git a/ts/fixtures/lang/expected/hints.ts b/ts/fixtures/lang/expected/hints.ts index ee23c76fc..2a3d6a76f 100644 --- a/ts/fixtures/lang/expected/hints.ts +++ b/ts/fixtures/lang/expected/hints.ts @@ -2964,30 +2964,30 @@ export function fill$Big_Skip_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8, export function fill$Unit_Filter_Map_RangeInclusive_u32_typed_closure1_typed_closure2(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { let len!: rt.usize; if (coll === 0) { - len = rt.iterToArray(items, undefined, 0).length; + len = rt.iterToArray(items, "next", 0).length; } else if (coll === 1) { const v: Unit.Unit[] = []; - rt.iterExtend(v, items, undefined, 0); + rt.iterExtend(v, items, "next", 0); len = v.length; } else if (coll === 2) { const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); - rt.iterExtend(v2, items, undefined, 0); + rt.iterExtend(v2, items, "next", 0); len = v2.length; } else if (coll === 3) { - len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, "next", 0).n; } else if (coll === 4) { const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); - rt.dequeExtend(q, items, undefined, 0); + rt.dequeExtend(q, items, "next", 0); len = q.n; } else if (coll === 5) { - len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + len = rt.heapFrom(rt.iterToArray(items, "next", 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; } else if (coll === 6) { const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); - rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), "next", 0); len = h.d.length; } else if (coll === 7) { - len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, "next", 0)); } else if (coll === 8) { len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); } else if (coll === 9) { @@ -3002,11 +3002,11 @@ export function fill$Unit_Filter_Map_RangeInclusive_u32_typed_closure1_typed_clo const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { return [t2, 1] as [Unit.Unit, rt.u32]; }); - len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, "next", 4)); } else if (coll === 11) { len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { return a0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)), 255, (v4: Unit.Unit[]): rt.usize => { return v4.length; }); } else { @@ -3020,7 +3020,7 @@ export function fill$Unit_Filter_Map_RangeInclusive_u32_typed_closure1_typed_clo _0 = rt.Ok(t); } return _0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)); if (_53.ok) { len = _53.value.length; } else { @@ -3034,30 +3034,30 @@ export function fill$Unit_Filter_Map_RangeInclusive_u32_typed_closure1_typed_clo export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { let len!: rt.usize; if (coll === 0) { - len = rt.iterToArray(items, undefined, 0).length; + len = rt.iterToArray(items, "next", 0).length; } else if (coll === 1) { const v: Unit.Unit[] = []; - rt.iterExtend(v, items, undefined, 0); + rt.iterExtend(v, items, "next", 0); len = v.length; } else if (coll === 2) { const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); - rt.iterExtend(v2, items, undefined, 0); + rt.iterExtend(v2, items, "next", 0); len = v2.length; } else if (coll === 3) { - len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, "next", 0).n; } else if (coll === 4) { const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); - rt.dequeExtend(q, items, undefined, 0); + rt.dequeExtend(q, items, "next", 0); len = q.n; } else if (coll === 5) { - len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + len = rt.heapFrom(rt.iterToArray(items, "next", 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; } else if (coll === 6) { const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); - rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), "next", 0); len = h.d.length; } else if (coll === 7) { - len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, "next", 0)); } else if (coll === 8) { len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); } else if (coll === 9) { @@ -3072,11 +3072,11 @@ export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1 const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { return [t2, 1] as [Unit.Unit, rt.u32]; }); - len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, "next", 4)); } else if (coll === 11) { len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { return a0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)), 255, (v4: Unit.Unit[]): rt.usize => { return v4.length; }); } else { @@ -3090,7 +3090,7 @@ export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1 _0 = rt.Ok(t); } return _0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)); if (_53.ok) { len = _53.value.length; } else { @@ -3104,30 +3104,30 @@ export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1 export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1$2(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { let len!: rt.usize; if (coll === 0) { - len = rt.iterToArray(items, undefined, 0).length; + len = rt.iterToArray(items, "next", 0).length; } else if (coll === 1) { const v: Unit.Unit[] = []; - rt.iterExtend(v, items, undefined, 0); + rt.iterExtend(v, items, "next", 0); len = v.length; } else if (coll === 2) { const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); - rt.iterExtend(v2, items, undefined, 0); + rt.iterExtend(v2, items, "next", 0); len = v2.length; } else if (coll === 3) { - len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, "next", 0).n; } else if (coll === 4) { const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); - rt.dequeExtend(q, items, undefined, 0); + rt.dequeExtend(q, items, "next", 0); len = q.n; } else if (coll === 5) { - len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + len = rt.heapFrom(rt.iterToArray(items, "next", 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; } else if (coll === 6) { const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); - rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), "next", 0); len = h.d.length; } else if (coll === 7) { - len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, "next", 0)); } else if (coll === 8) { len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); } else if (coll === 9) { @@ -3142,11 +3142,11 @@ export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1 const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { return [t2, 1] as [Unit.Unit, rt.u32]; }); - len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, "next", 4)); } else if (coll === 11) { len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { return a0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)), 255, (v4: Unit.Unit[]): rt.usize => { return v4.length; }); } else { @@ -3160,7 +3160,7 @@ export function fill$Unit_Map_Flatten_IntoIter_RangeInclusive_u32_typed_closure1 _0 = rt.Ok(t); } return _0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)); if (_53.ok) { len = _53.value.length; } else { @@ -3244,30 +3244,30 @@ export function fill$Unit_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8, ite export function fill$Unit_Skip_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8, items: rt.Iter, seed: Unit.Unit, out: rt.ByteVec): void { let len!: rt.usize; if (coll === 0) { - len = rt.iterToArray(items, undefined, 0).length; + len = rt.iterToArray(items, "next", 0).length; } else if (coll === 1) { const v: Unit.Unit[] = []; - rt.iterExtend(v, items, undefined, 0); + rt.iterExtend(v, items, "next", 0); len = v.length; } else if (coll === 2) { const v2: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); - rt.iterExtend(v2, items, undefined, 0); + rt.iterExtend(v2, items, "next", 0); len = v2.length; } else if (coll === 3) { - len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, undefined, 0).n; + len = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, items, "next", 0).n; } else if (coll === 4) { const _21: Unit.Unit[] = rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone); const q: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, rt.iterSlice(_21), undefined, 0, true); - rt.dequeExtend(q, items, undefined, 0); + rt.dequeExtend(q, items, "next", 0); len = q.n; } else if (coll === 5) { - len = rt.heapFrom(rt.iterToArray(items, undefined, 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; + len = rt.heapFrom(rt.iterToArray(items, "next", 0), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)).d.length; } else if (coll === 6) { const h: rt.BinaryHeap = rt.heapFrom(rt.vecFromElem(Unit.clone$Clone(seed), 2, Unit.clone$Clone), rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd)); - rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), undefined, 0); + rt.heapExtend(h, items, rt.cmpLe(Unit.partialCmp$PartialOrd), rt.cmpGe(Unit.partialCmp$PartialOrd), rt.cmpLt(Unit.partialCmp$PartialOrd), "next", 0); len = h.d.length; } else if (coll === 7) { - len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, undefined, 0)); + len = rt.btreeLen(rt.btreeExtendKeys(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeSet, items, true, undefined, "next", 0)); } else if (coll === 8) { len = rt.hashLen(rt.hashExtendKeys(rt.hashNew(rt.hashing(Unit.hash$Hash_DefaultHasher as (a0: Unit.Unit, a1: rt.Hasher) => undefined, Unit.eq$PartialEq)) as rt.HashSet, items, undefined, undefined, 536870911)); } else if (coll === 9) { @@ -3282,11 +3282,11 @@ export function fill$Unit_Skip_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8 const _50: rt.Iter<[Unit.Unit, rt.u32]> = rt.iterMap(items, (t2: Unit.Unit): [Unit.Unit, rt.u32] => { return [t2, 1] as [Unit.Unit, rt.u32]; }); - len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, undefined, 4)); + len = rt.btreeLen(rt.btreeExtend(rt.btreeNew(Unit.cmp$Ord) as rt.BTreeMap, _50, true, undefined, undefined, "next", 4)); } else if (coll === 11) { len = mapOr$0r2th8w(rt.iterCollectOption(rt.iterMap(items, (a0: Unit.Unit): Unit.Unit | undefined => { return a0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)), 255, (v4: Unit.Unit[]): rt.usize => { + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)), 255, (v4: Unit.Unit[]): rt.usize => { return v4.length; }); } else { @@ -3300,7 +3300,7 @@ export function fill$Unit_Skip_Map_RangeInclusive_u32_typed_closure1(coll: rt.u8 _0 = rt.Ok(t); } return _0; - }), (values: rt.Iter) => rt.iterToArray(values, undefined, 0)); + }), (values: rt.Iter) => rt.iterToArray(values, "next", 0)); if (_53.ok) { len = _53.value.length; } else { diff --git a/ts/fixtures/lang/expected/zeros.ts b/ts/fixtures/lang/expected/zeros.ts index b87d10eb6..43580caeb 100644 --- a/ts/fixtures/lang/expected/zeros.ts +++ b/ts/fixtures/lang/expected/zeros.ts @@ -158,7 +158,7 @@ export function zeros(kind: rt.u8, data: rt.ByteSlice, out: rt.ByteVec): void { return captured & 0xff; } return undefined; - })); + }), "next"); rt.iterEmpty(); rt.byteVecPush(out, rt.iterMap(rt.iterEmpty() as rt.Iter, (b2: rt.u8): rt.u8 => { return rt.u8Add(b2, 1);