Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion quest/m2/ts-model/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ Public API: the translator's output for moq-net's model.
- [Shared ownership](/quest/m2/ts-shared.md) - kio's waiters are `Arc`/`Weak` with observable counts, and its atomics and locks are plain values
- [Translate safe dependencies with the package](/quest/m2/ts-model/crates.md) - kio, moq-clock, moq-pattern, and rangemap translate as one program with moq-net
- [Float formatting](/quest/m2/ts-model/floats.md) - `f64` formats and parses as std does
- [Std's mutable references to values JS copies](/quest/m2/ts-model/std-places.md) - `as_mut`, `get_or_insert`, `iter_mut`, and the rest give an `rt.Place`
- [The rest of std the model reaches](/quest/m2/ts-model/std-rest.md) - the std calls the census still refuses
- [Well-known crates without config](/quest/m2/ts-model/stock.md) - rust2-ts maps `bytes`, `rand`, and `tracing` itself, so `model.toml` stops binding and ignoring them
- [Async in the TypeScript translator](/quest/m2/ts-async.md) - kio's producers and consumers are futures
24 changes: 0 additions & 24 deletions quest/m2/ts-model/std-places.md

This file was deleted.

2 changes: 1 addition & 1 deletion quest/m2/ts-model/std-rest.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

rust2-ts translates the std calls the model's census still refuses after
[std gaps](https://github.com/kixelated/rust2/pull/124) and [core's MIR](https://github.com/kixelated/rust2/pull/129),
outside [Places](/quest/m2/ts-model/std-places.md), proven by differential tests against
outside [Places](https://github.com/kixelated/rust2/pull/149), proven by differential tests against
native Rust.

## Plan
Expand Down
6 changes: 3 additions & 3 deletions ts/fixtures/lang/expected/combinators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as rt from "./rt.ts";
import { copy$Result_u32s_u16, copy$u32s } from "./lib.ts";
import { isSomeAnd$Option_u8_bools_closure0, isNoneOr$Option_u8_options_closure1, unwrapOr$Option_u8, unwrapOrElse$Option_String_owned_closure3, unwrapOrElse$Option_u8_options_closure9, unwrapOrDefault$Option_String, unwrapOrDefault$Option_Vec_u8, unwrapOrDefault$Option_u8, map$Option_u8_String_owned_closure0, map$Option_u8_Vec_u8_owned_closure4, map$Option_u8_u32s_owned_closure9, map$Option_u8_u8_made_closure0_closure0, inspect$Option_u8_options_closure11, mapOr$Option_u16_u8_hash_maps_closure0, mapOr$Option_u8_u8_iters_closure3, mapOr$Option_u8_u8_u8_btree_maps_closure0, mapOrElse$Option_u8_u8_options_closure7_options_closure8, okOr$Option_u32s_u8, okOr$Option_u8_u16, okOr$Option_u8_u8, okOrElse$Option_Vec_u8_String_owned_closure5, okOrElse$Option_u8_u16_options_closure12, and$Option_u8_u8, andThen$Option_u8_u8_options_closure2, filter$Option_String_owned_closure1, filter$Option_u8_combinators_closure0, or$Option_u8, orElse$Option_String_owned_closure2, orElse$Option_u8_options_closure6, xor$Option_u8, zip$Option_u8_u8, clone$Clone_Option_String } from "./core/option.ts";
import { isSomeAnd$Option_u8_bools_closure0, isNoneOr$Option_u8_options_closure1, unwrapOr$Option_u8, unwrapOrElse$Option_String_owned_closure3, unwrapOrElse$Option_u8_options_closure9, unwrapOrDefault$Option_String, unwrapOrDefault$Option_Vec_u8, unwrapOrDefault$Option_u8, map$Option_u8_String_owned_closure0, map$Option_u8_Vec_u8_owned_closure4, map$Option_u8_u32s_owned_closure9, map$Option_u8_u8_elements_closure8, inspect$Option_u8_options_closure11, mapOr$Option_u16_u8_hash_maps_closure0, mapOr$Option_u8_u8_elements_closure3, mapOr$Option_u8_u8_u8_btree_maps_closure0, mapOrElse$Option_u8_u8_options_closure7_options_closure8, okOr$Option_u32s_u8, okOr$Option_u8_u16, okOr$Option_u8_u8, okOrElse$Option_Vec_u8_String_owned_closure5, okOrElse$Option_u8_u16_options_closure12, and$Option_u8_u8, andThen$Option_u8_u8_options_closure2, filter$Option_String_owned_closure1, filter$Option_u8_combinators_closure0, or$Option_u8, orElse$Option_String_owned_closure2, orElse$Option_u8_options_closure6, xor$Option_u8, zip$Option_u8_u8, clone$Clone_Option_String } from "./core/option.ts";
import { isOkAnd$Result_u8_u16_results_closure5, isErrAnd$Result_u8_u16_results_closure6, ok$Result_u8_u16, err$Result_u8_u16, asRef$Result_u8_u16, map$Result_Vec_u8_String_Vec_u8_owned_closure6, map$Result_u8_u16_u8_options_closure13, mapOr$Result_u8_u16_u8_results_closure7, mapOrElse$Result_u8_u16_u8_results_closure8_results_closure9, mapErr$Result_u32s_u8_u16_from, mapErr$Result_u8_u16_u16_results_closure14, inspect$Result_u8_u16_results_closure12, inspectErr$Result_u8_u16_results_closure13, unwrapOrDefault$Result_u8_u16, and$Result_u8_u16_u8, andThen$Result_u8_u16_u8_results_closure3, or$Result_u8_u16_u16, orElse$Result_u8_u16_u16_results_closure4, unwrapOr$Result_u8_u16, unwrapOrElse$Result_u8_u16_results_closure11, unwrapOrElse$Result_u8_u8_panics_closure1, copied$Result_u8_u16, clone$Clone_Result_Vec_u8_String } from "./core/result.ts";

/** Run case `kind % 4` over `data`, whose bytes pick each `Some` or `None`, `Ok` or `Err`. */
Expand Down Expand Up @@ -39,11 +39,11 @@ export function options(a: rt.u8 | undefined, b: rt.u8 | undefined, limit: rt.u8
return rt.u8CheckedAdd(x3, limit);
}), (x4: rt.u8): rt.u8 | undefined => {
rt.byteVecPush(out, 162);
return map$Option_u8_u8_made_closure0_closure0(b, (y: rt.u8): rt.u8 => {
return map$Option_u8_u8_elements_closure8(b, (y: rt.u8): rt.u8 => {
return x4 ^ y;
});
}), 238));
rt.byteVecPush(out, mapOr$Option_u8_u8_iters_closure3(filter$Option_u8_combinators_closure0(a, (x5: rt.u8): boolean => {
rt.byteVecPush(out, mapOr$Option_u8_u8_elements_closure3(filter$Option_u8_combinators_closure0(a, (x5: rt.u8): boolean => {
rt.byteVecPush(out, 163);
return x5 > limit;
}), 221, (x6: rt.u8): rt.u8 => {
Expand Down
56 changes: 54 additions & 2 deletions ts/fixtures/lang/expected/core/option.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,27 @@ export function unwrapOr$Option_u16(self: rt.u16 | undefined, default_: rt.u16):
return self;
}

export function unwrapOr$Option_u32(self: rt.u32 | undefined, default_: rt.u32): rt.u32 {
if (self === undefined) {
return default_;
}
return self;
}

export function unwrapOr$Option_u8(self: rt.u8 | undefined, default_: rt.u8): rt.u8 {
if (self === undefined) {
return default_;
}
return self;
}

export function unwrapOr$Option_u8_u8(self: [rt.u8, rt.u8] | undefined, default_: [rt.u8, rt.u8]): [rt.u8, rt.u8] {
if (self === undefined) {
return default_;
}
return self;
}

export function unwrapOr$Option_usize_u8(self: [rt.usize, rt.u8] | undefined, default_: [rt.usize, rt.u8]): [rt.usize, rt.u8] {
if (self === undefined) {
return default_;
Expand Down Expand Up @@ -205,7 +219,21 @@ export function map$Option_u8_u32s_owned_closure9(self: rt.u8 | undefined, f: (a
return f(self);
}

export function map$Option_u8_u8_made_closure0_closure0(self: rt.u8 | undefined, f: (a0: rt.u8) => rt.u8): rt.u8 | undefined {
export function map$Option_u8_u8_elements_closure8(self: rt.u8 | undefined, f: (a0: rt.u8) => rt.u8): rt.u8 | undefined {
if (self === undefined) {
return undefined;
}
return f(self);
}

export function map$Option_u8_u8_u8_elements_closure9(self: rt.u8 | undefined, f: (a0: rt.u8) => [rt.u8, rt.u8]): [rt.u8, rt.u8] | undefined {
if (self === undefined) {
return undefined;
}
return f(self);
}

export function map$Option_u8_u8_u8_u8_lent_closure2(self: [rt.u8, rt.u8] | undefined, f: (a0: [rt.u8, rt.u8]) => [rt.u8, rt.u8]): [rt.u8, rt.u8] | undefined {
if (self === undefined) {
return undefined;
}
Expand Down Expand Up @@ -331,6 +359,13 @@ export function mapOr$Option_u16_u8_hash_maps_closure0(self: rt.u16 | undefined,
return f(self);
}

export function mapOr$Option_u32_u32_lent_closure4(self: rt.Place<rt.u32> | undefined, default_: rt.u32, f: (a0: rt.Place<rt.u32>) => rt.u32): rt.u32 {
if (self === undefined) {
return default_;
}
return f(self);
}

export function mapOr$Option_u8_bool_take_largest_closure0(self: rt.u8 | undefined, default_: boolean, f: (a0: rt.u8) => boolean): boolean {
if (self === undefined) {
return default_;
Expand All @@ -345,7 +380,7 @@ export function mapOr$Option_u8_u64_floats_closure1(self: rt.u8 | undefined, def
return f(self);
}

export function mapOr$Option_u8_u8_iters_closure3(self: rt.u8 | undefined, default_: rt.u8, f: (a0: rt.u8) => rt.u8): rt.u8 {
export function mapOr$Option_u8_u8_elements_closure3(self: rt.u8 | undefined, default_: rt.u8, f: (a0: rt.u8) => rt.u8): rt.u8 {
if (self === undefined) {
return default_;
}
Expand Down Expand Up @@ -506,6 +541,13 @@ export function andThen$Option_Option_u8_Option_u8_made_closure1(self: rt.u8 | u
return f(self);
}

export function andThen$Option_u32_u32_lent_closure3(self: rt.Place<rt.u32> | undefined, f: (a0: rt.Place<rt.u32>) => rt.Place<rt.u32> | undefined): rt.Place<rt.u32> | undefined {
if (self === undefined) {
return undefined;
}
return f(self);
}

export function andThen$Option_u8_u8_options_closure2(self: rt.u8 | undefined, f: (a0: rt.u8) => rt.u8 | undefined): rt.u8 | undefined {
if (self === undefined) {
return undefined;
Expand Down Expand Up @@ -543,6 +585,16 @@ export function filter$Option_u8_combinators_closure0(self: rt.u8 | undefined, p
return undefined;
}

export function filter$Option_u8_u8_lent_closure1(self: [rt.u8, rt.u8] | undefined, predicate: (a0: [rt.u8, rt.u8]) => boolean): [rt.u8, rt.u8] | undefined {
if (self !== undefined) {
const x: [rt.u8, rt.u8] = self;
if (predicate(x)) {
return x;
}
}
return undefined;
}

export function or$Option_Option_u8(self: rt.u8 | undefined | rt.None, optb: rt.u8 | undefined | rt.None): rt.u8 | undefined | rt.None {
if (self === rt.None) {
return optb;
Expand Down
Loading