From 1c559a69f455fa640e497d9a38b0ea5b655894e2 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sat, 2 May 2026 19:57:10 -0400 Subject: [PATCH 1/7] WIP: nimble-tern-266 --- src/v3/std/runtime.dag | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/v3/std/runtime.dag b/src/v3/std/runtime.dag index 95bc4171c2e..72fe5e8289f 100644 --- a/src/v3/std/runtime.dag +++ b/src/v3/std/runtime.dag @@ -83,13 +83,21 @@ type EvalFrame { // §Substrate Targets and the merged audit // `docs/briefs/r2-pr-a-2-eval-frame-dependency-audit.md`. Frame push/pop // is evaluator-internal; the stack is not observable as a `Value`. PR-A.3 -// owns `EvalThunk` / `EvalStrategy` / `EvalMemoKey` and may revisit the -// orientation when memoization keying lands; PR-A.2 must not silently -// amend the locked carrier shape. +// consumes this stack structurally through `EvalStateKey` / `EvalMemoKey`; +// PR-A.2 must not silently amend the locked carrier shape. type EvalStateStack { frames: List } +// 🟢 TERMINAL at PR-A.3 memo-key scope. Memoization identity is structural: +// the reachable evaluator state is the `EvalStateStack`, not a string digest, +// declaration name, frame count, or other name-only fingerprint. A future +// digest carrier may replace this only when its construction and equality are +// declared as the single authority over reachable-state identity. +type EvalStateKey { + state: EvalStateStack +} + // 🟢 TERMINAL at PR-A.3 eager-baseline scope. The evaluator's first executable // strategy is applicative/eager evaluation, and this carrier intentionally has // exactly one inhabitant until a later slice lands another executable strategy @@ -101,3 +109,14 @@ type EvalStrategy = ApplicativeOrder { input_order: InputEvaluationOrder } // order consumed by the initial evaluator strategy. Additional order variants // are semantic expansions and must land with executable evaluator behavior. type InputEvaluationOrder = LeftFirst + +// 🟢 TERMINAL at PR-A.3 memo-key scope. This declares the key shape for any +// later evaluator memo table without implementing caching behavior. `state_key` +// is structural evaluator state and `strategy` is the closed strategy carrier; +// neither may be replaced by strings, names, or host-only labels. +type EvalMemoKey { + program: DeclarationId + node: NodeId + state_key: EvalStateKey + strategy: EvalStrategy +} From ee1fe3c7c20d7cd70c83acfc2c5ca3c1144d3833 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sat, 2 May 2026 20:01:47 -0400 Subject: [PATCH 2/7] WIP: nimble-tern-266 --- ...2-evaluator-cadence-verification-matrix.md | 2 +- .../r2-pr-b-body-evaluator-eager-baseline.md | 10 +- .../r3-v-l4-l7-direct-readiness-audit.md | 9 +- ...-l4-l7-direct-readiness-reaudit-post-e5.md | 12 +- src/v3/compiler/src/bootstrap_generated.rs | 6250 +++++++++-------- ...otstrap_generated_without_parse_surface.rs | 5762 +++++++-------- .../m2_substrate_inhabitance_test.rs | 45 + 7 files changed, 6119 insertions(+), 5971 deletions(-) diff --git a/docs/briefs/r2-evaluator-cadence-verification-matrix.md b/docs/briefs/r2-evaluator-cadence-verification-matrix.md index f50537791a5..39914c0b70f 100644 --- a/docs/briefs/r2-evaluator-cadence-verification-matrix.md +++ b/docs/briefs/r2-evaluator-cadence-verification-matrix.md @@ -23,7 +23,7 @@ Make **Evaluator-side** gate status, **next allowed** work shape, and **forbidde |---|---|---|---|---|---| | **PR-A.1 — runtime `Value` + `NamedField`** | Evaluator Manager + **Worker A** (substrate/runtime module) | **Landed** — observable `Value` / `NamedField` live in `src/v3/std/runtime.dag` per [`r2-pr-a-runtime-value-model.md`](r2-pr-a-runtime-value-model.md) PR-A.1 + PB §3.2; [PR #1243](https://github.com/gunb-ai/gunbc/pull/1243) followed the dependency recorded in [`r2-pr-a1-runtime-value-dependency-audit.md`](r2-pr-a1-runtime-value-dependency-audit.md). | PB-Runtime shape match; L1 `ValueBehavior` marker remains distinct. | Consume the carrier from `v3.std.runtime`; strengthen downstream gates when PR-A.3 strategy/memo carriers land (PR-A.2 carriers already in `runtime.dag`). | No reopening `RuntimeValue`; no `ClosureValue`; no body execution. | | **PR-A.2 — `EvalFrame` / `EvalStateStack`** | **Worker C / merry-heron-351** | **Landed** — `EvalFrame` / `EvalStateStack` live in `src/v3/std/runtime.dag` per [PR #1255](https://github.com/gunb-ai/gunbc/pull/1255) (merged dependency audit [PR #1222](https://github.com/gunb-ai/gunbc/pull/1222)). | PR-A.1 carriers; **unique-binding** `Map` disposition per PR-A brief (fail-closed map, not duplicate-admitting lists). | Mirror / consume landed carriers in evaluator wiring **without** new observable `Value` variants; tighten gates when PR-A.3 lands. | No `Value` inhabitants for closures; no skipping unique-binding carrier discipline. | -| **PR-A.3 — strategy / memoization** | Substrate carrier owner + Worker A test surface | **Eager strategy carrier landed; memo-key surface remains** — `EvalStrategy` / `InputEvaluationOrder` live in `src/v3/std/runtime.dag` with generated-full-bootstrap coverage; [`r2-pr-a3-strategy-memoization-audit.md`](r2-pr-a3-strategy-memoization-audit.md) remains the decision surface, and [`r2-pr-a3-implementation-blocker-audit.md`](r2-pr-a3-implementation-blocker-audit.md) is the historical receipt for the parser gap resolved by [PR #1286](https://github.com/gunb-ai/gunbc/pull/1286). Substrate owns remaining carrier declarations; Worker A owns non-overlapping follow-on tests. | Live `EvalFrame` / `EvalStateStack`, `EvalStrategy`, and `InputEvaluationOrder` in `src/v3/std/runtime.dag`; remaining PR-A.3 carrier surface is structural `EvalMemoKey` / `EvalStateKey` from the PR-A.0 sketch in [`r2-pr-a-runtime-value-model.md`](r2-pr-a-runtime-value-model.md). | Land structural memo-key carriers per audit in the Substrate-owned declaration slice; add Worker A generated-full-bootstrap tests for memo-key carrier shape after declarations land; add `EvalThunk` / lazy only with TC2 obligations understood. | No memoization that caches partial diagnostics as `Value`; no orphan strategy labels outside closed carriers; no name-only state fingerprints; no fake variants / alias workaround. | +| **PR-A.3 — strategy / memoization** | Substrate carrier owner + Worker A test surface | **Carrier surface landed** — `EvalStrategy` / `InputEvaluationOrder` and structural `EvalStateKey` / `EvalMemoKey` live in `src/v3/std/runtime.dag` with generated-full-bootstrap coverage; [`r2-pr-a3-strategy-memoization-audit.md`](r2-pr-a3-strategy-memoization-audit.md) remains the decision surface, and [`r2-pr-a3-implementation-blocker-audit.md`](r2-pr-a3-implementation-blocker-audit.md) is the historical receipt for the parser gap resolved by [PR #1286](https://github.com/gunb-ai/gunbc/pull/1286). | Live `EvalFrame` / `EvalStateStack`, `EvalStrategy`, `InputEvaluationOrder`, `EvalStateKey`, and `EvalMemoKey` in `src/v3/std/runtime.dag`; `EvalMemoKey` keys by `DeclarationId`, `NodeId`, structural `EvalStateKey`, and the closed strategy carrier. | Consume the closed eager strategy and structural memo-key carriers in PR-B/W1 as needed; add `EvalThunk` / lazy only with TC2 obligations understood. | No memoization that caches partial diagnostics as `Value`; no orphan strategy labels outside closed carriers; no name-only state fingerprints; no fake variants / alias workaround. | | **PR-B — body evaluator** | Evaluator (worker brief pending) | **Not authored / not started** — [`r2-evaluator-manager.md`](r2-evaluator-manager.md) table. | **PR-A.1 through PR-A.3** for runtime/evaluator state; **worker dispatch** on implementation sub-lanes still joint-gated on **PR-E + R1 close** per manager option (c). | Author PR-B **design** brief after PR-A substrate is real; **no** implementation until PR-A chain + manager dispatch gates clear. | No structural body execution before frames + strategy boundary exist. | | **PR-D — cross-target harness** | Evaluator Manager | **Design lock introduced** — [`docs/design-cross-target-equivalence.md`](../design-cross-target-equivalence.md); **slice 0 + slice 1 landed** — `Compiles` + `DifferentialEquals` scaffold per [`r2-pr-d-cross-target-equivalence-harness-primitives.md`](r2-pr-d-cross-target-equivalence-harness-primitives.md). | **Slice 2** gated: R2-T-Ground-**LanguageSpec**, **all Shape A targets grounded**, **T-Verification-L4-L7-Direct corpus** (that brief Dependencies table). | **Next:** docs-only updates, R3 corpus planning against the design lock, or Director-approved **existing** `ForAllTargets` claim wiring **only** when those deps are live and cited; otherwise keep deferral. | **No** L5 corpus execution at R2; **no** concrete target enumeration without live deps; **no** new `TestPredicate` variants (INVARIANTS P1). | | **PR-E E9 — cross-target harness consumption** | Evaluator / PR-E lane | **Readiness-audit only** — [`r3-pr-e9-cross-target-harness-consumption-readiness.md`](r3-pr-e9-cross-target-harness-consumption-readiness.md) records that current main is not implementation-ready. | PR-D slice 0 + slice 1; PR-D design lock; **blocked** on LanguageSpec, all Shape A targets, L4/L7 corpus seed, and typed structural observation. | Keep docs/blocker rows current until all gates are cited together; then a single Director-approved `ForAllTargets` receipt may consume the existing PR-D/L5 fixture home. | No runner implementation; no target enumeration; no raw stdout/byte equality; no new predicate or substrate carrier. | diff --git a/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md b/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md index fd4e1135384..9c2ba99f746 100644 --- a/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md +++ b/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md @@ -171,11 +171,11 @@ These are **not** in PR-B.0 design lock and **not** in PR-B.1 implementation: Full evaluator execution cannot ship in R2 because: -1. **Strategy carriers absent at HEAD.** `EvalStrategy`, - `InputEvaluationOrder`, `EvalStateKey`, `EvalMemoKey` are audited but not - declared. Without the strategy carrier PR-B.1 has nothing to read, and - without `EvalMemoKey` the memoization boundary is undeclared. The - PR-A.3 audit explicitly lists these as the implementation-side gap. +1. **Strategy and memo-key carriers now declared.** `EvalStrategy`, + `InputEvaluationOrder`, `EvalStateKey`, and `EvalMemoKey` live in + `src/v3/std/runtime.dag`. PR-B.1 may read the closed eager strategy and + structural memo-key boundary from the PR-A.3 carrier surface rather than + inventing a local no-memo or string-key convention. 2. **Execution semantics for non-eager strategies undeclared.** `NormalOrder` has no rule, no thunk capture point, and no TC2 comparison obligation (PR-A.3 audit §EvalStrategy). Until those land, the evaluator cannot diff --git a/docs/briefs/r3-v-l4-l7-direct-readiness-audit.md b/docs/briefs/r3-v-l4-l7-direct-readiness-audit.md index 060f1010581..b50d94681ea 100644 --- a/docs/briefs/r3-v-l4-l7-direct-readiness-audit.md +++ b/docs/briefs/r3-v-l4-l7-direct-readiness-audit.md @@ -16,7 +16,7 @@ and [`r3-v-l4-l7-direct-scaffold-notes.md`](r3-v-l4-l7-direct-scaffold-notes.md) |---|---|---| | PR-A.2 frame state | `src/v3/std/runtime.dag` declares `EvalFrame { bindings: Map }` and `EvalStateStack { frames: List }`; Rust side has `EvalFrame` / `EvalStateStack` helpers in `src/v3/compiler/src/lib.rs`. | Landed enough for environment shape; no longer a blanket Lane 1 blocker. | | PR-A.3 strategy carriers | `EvalStrategy = ApplicativeOrder { input_order: InputEvaluationOrder }` and `InputEvaluationOrder = LeftFirst` are now declared in `runtime.dag`. | The eager/left-first strategy identity is live. | -| PR-A.3 memo carriers | `EvalStateKey` and `EvalMemoKey` are still absent from `runtime.dag`. | Memoization identity remains open; do not claim PR-A.3 complete. Slice 1 can proceed only if PR-B.2 chooses no-memo or cites a Director-approved memo deferral. | +| PR-A.3 memo carriers | `EvalStateKey { state: EvalStateStack }` and `EvalMemoKey { program: DeclarationId, node: NodeId, state_key: EvalStateKey, strategy: EvalStrategy }` are declared in `runtime.dag`. | Structural memo-key identity is live; this audit's former memo-carrier blocker is closed. | | PR-B body evaluator | `r2-pr-b-body-evaluator-eager-baseline.md` and `r2-pr-b-1-eager-evaluator-implementation-seed.md` are design/seed briefs; no full eager evaluator entry point is visible on main. | `dag_eval_output` cannot be a real producer yet. | | PR-E E2 environment | EvalFrame/Bind environment helpers landed on main via #1374. | Removes a frame API gap, but not the body-execution gap. | | PR-B.2/W1 runner extension | `r2-pr-b-2-runner-extension-bundle.md` owns `rust_emit_output` + `dag_eval_output`. `test_runner.rs::eval_differential_equals` still accepts only `(v3_program_cost, v2_oracle_cost)`. | L4 fixture row should wait for W1 producer dispatch, not invent a local predicate or stdout convention. | @@ -68,10 +68,9 @@ variant is needed for slice 1. The open question is sequencing, not predicate shape. `rust_emit_output` can land independently of body evaluation, but `dag_eval_output` requires a real -PR-B.1 eager evaluator. Because `EvalStateKey` / `EvalMemoKey` are absent at -HEAD, the implementation brief must either wait for those memo carriers or -explicitly scope slice 1 to no-memo eager evaluation under Director approval. -Without that disposition, `dag_eval_output` would still be a fabricated oracle. +PR-B.1 eager evaluator and W1 producer wiring. The PR-A.3 structural memo-key +carriers are now declared, so this audit's former no-memo carve-out question is +no longer the blocking gate for `dag_eval_output`. Cross-program flag: this is the same structural-observation/value-normalization surface called out by the Lane 2 readiness work. The shared comparator should diff --git a/docs/briefs/r3-v-l4-l7-direct-readiness-reaudit-post-e5.md b/docs/briefs/r3-v-l4-l7-direct-readiness-reaudit-post-e5.md index aa5414794a8..9306559e626 100644 --- a/docs/briefs/r3-v-l4-l7-direct-readiness-reaudit-post-e5.md +++ b/docs/briefs/r3-v-l4-l7-direct-readiness-reaudit-post-e5.md @@ -15,7 +15,7 @@ worker is not dispatch-ready until W1 wires `rust_emit_output` and |---|---|---| | PR-A.2 frames | `src/v3/std/runtime.dag:76-90` declares `EvalFrame { bindings: Map }` and `EvalStateStack { frames: List }`. | Still landed; not a blocker. | | PR-A.3 eager strategy | `src/v3/std/runtime.dag:93-103` declares `EvalStrategy = ApplicativeOrder { input_order: InputEvaluationOrder }` and `InputEvaluationOrder = LeftFirst`. | Eager/left-first strategy identity is live. | -| PR-A.3 memo carriers | `src/v3/std/runtime.dag:86` mentions `EvalMemoKey` as PR-A.3-owned future work, but the live declarations jump from `EvalStateStack` to `EvalStrategy` at `src/v3/std/runtime.dag:89-98`; `git grep` finds no `type EvalStateKey` or `type EvalMemoKey` declaration at HEAD. | Memo identity remains absent. A no-memo eager carve-out still needs Director/runner-owner framing. | +| PR-A.3 memo carriers | `src/v3/std/runtime.dag` declares `EvalStateKey { state: EvalStateStack }` and `EvalMemoKey { program: DeclarationId, node: NodeId, state_key: EvalStateKey, strategy: EvalStrategy }`. | Structural memo identity is live. The former no-memo eager carve-out gate is closed; W1 producer wiring remains the blocker. | | Body evaluator | `src/v3/compiler/src/lib.rs:547-553` exposes `pub fn evaluate_body(...) -> Result`. Tests cover the shell at `src/v3/compiler/src/lib.rs:820-829` and branch dispatch at `src/v3/compiler/src/lib.rs:1344-1373`. | The old "no body evaluator entry point" blocker is closed. | | W1 producer fixture | `src/v3/compiler/tests/fixtures/r3_verification_l4_emit_eval_match.dag:19-23` still defines `rust_emit_output` / `dag_eval_output` as `miss_int_lookup()` placeholders, and the fixture header at `:1-4` says runner support is intentionally NYI until wiring lands. | The structural fixture exists, but producers are not real. | | W1 runner extension | `src/v3/compiler/src/test_runner.rs:2336-2344` still accepts only `(v3_program_cost, v2_oracle_cost)` for `DifferentialEquals`; any other pairing returns `NotYetImplemented`. | `rust_emit_output` / `dag_eval_output` remain unwired. This is the blocking gate. | @@ -32,9 +32,9 @@ The four #1392 fire criteria now evaluate as: 2. **`dag_eval_output` backed by real evaluator:** **Partially.** `evaluate_body` exists and has E5-era runtime coverage, but no `dag_eval_output` producer calls it from `TestRunner`. -3. **Memo gap closed or explicitly deferred:** **Still open.** No - `EvalStateKey` / `EvalMemoKey` declarations exist; an eager no-memo carve-out - is plausible but not sufficient without W1 producer wiring. +3. **Memo gap closed or explicitly deferred:** **Closed.** `EvalStateKey` / + `EvalMemoKey` declarations now exist with structural state and closed + strategy fields; W1 producer wiring remains independently required. 4. **Worker brief preserves failure taxonomy and fixture path:** **Yes.** The existing fixture path remains `src/v3/compiler/tests/fixtures/r3_verification_l4_emit_eval_match.dag`, and @@ -56,8 +56,8 @@ Recommended trigger for re-engagement: `NotYetImplemented` branch; and - `dag_eval_output` invokes the real eager evaluator path rather than fixture lookup or placeholder `miss_int_lookup()`; and -- the no-memo eager carve-out is explicitly recorded, or `EvalStateKey` / - `EvalMemoKey` carriers land. +- `EvalMemoKey` is consumed as the declared structural memo identity if W1 uses + memoization; no string/name-only state key is introduced. Until then, cool-crab / Lane 1 implementation should stay on hold. The concrete blocker is no longer evaluator critical mass; it is the W1 producer bridge diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index e647ea9b2a1..d90647db0c1 100644 --- a/src/v3/compiler/src/bootstrap_generated.rs +++ b/src/v3/compiler/src/bootstrap_generated.rs @@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { ports: bootstrapped_fixture_dag_ports(), diagnostics: bootstrapped_fixture_dag_diagnostics(), next_node_id: 275, - next_declaration_id: 2265, + next_declaration_id: 2267, next_port_id: 371, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { callable_strategy_variants: CallableStrategyVariants::default(), clusters: bootstrapped_fixture_dag_clusters(), optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 2265, + declaration_append_begin_after_bootstrap: 2267, } } @@ -118,21 +118,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(7), - target: TransformTarget::Callable(DeclarationId(1727)), + target: TransformTarget::Callable(DeclarationId(1729)), inputs: vec![PortId(9)], output: PortId(11), span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(8), - target: TransformTarget::Callable(DeclarationId(1729)), + target: TransformTarget::Callable(DeclarationId(1731)), inputs: vec![PortId(11)], output: PortId(12), span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(9), - target: TransformTarget::Callable(DeclarationId(1689)), + target: TransformTarget::Callable(DeclarationId(1691)), inputs: vec![PortId(9), PortId(10), PortId(12)], output: PortId(13), span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446), @@ -148,7 +148,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(11), - target: TransformTarget::Callable(DeclarationId(1691)), + target: TransformTarget::Callable(DeclarationId(1693)), inputs: vec![PortId(14), PortId(15), PortId(16)], output: PortId(17), span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633), @@ -164,7 +164,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(13), - target: TransformTarget::Callable(DeclarationId(1730)), + target: TransformTarget::Callable(DeclarationId(1732)), inputs: vec![PortId(18)], output: PortId(19), span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), @@ -317,7 +317,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(27), - target: TransformTarget::Callable(DeclarationId(1724)), + target: TransformTarget::Callable(DeclarationId(1726)), inputs: vec![PortId(35)], output: PortId(36), span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256), @@ -347,7 +347,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(31), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(40)], output: PortId(41), span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560), @@ -477,14 +477,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(43), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(54)], output: PortId(55), span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(44), - target: TransformTarget::Callable(DeclarationId(1732)), + target: TransformTarget::Callable(DeclarationId(1734)), inputs: vec![PortId(53), PortId(55)], output: PortId(56), span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), @@ -1194,7 +1194,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(91), - target: TransformTarget::Callable(DeclarationId(1734)), + target: TransformTarget::Callable(DeclarationId(1736)), inputs: vec![PortId(136), PortId(137)], output: PortId(138), span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), @@ -1222,7 +1222,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(95), - target: TransformTarget::Callable(DeclarationId(1736)), + target: TransformTarget::Callable(DeclarationId(1738)), inputs: vec![PortId(141), PortId(142)], output: PortId(143), span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), @@ -1525,7 +1525,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(113), target: TransformTarget::FieldProject { field_label: "rest".to_string(), - field_child: Some(DeclarationId(1503)), + field_child: Some(DeclarationId(1505)), }, inputs: vec![PortId(161)], output: PortId(164), @@ -1533,14 +1533,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(114), - target: TransformTarget::Callable(DeclarationId(1737)), + target: TransformTarget::Callable(DeclarationId(1739)), inputs: vec![PortId(163), PortId(164)], output: PortId(165), span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(115), - target: TransformTarget::Callable(DeclarationId(1738)), + target: TransformTarget::Callable(DeclarationId(1740)), inputs: vec![PortId(162), PortId(165)], output: PortId(166), span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), @@ -1556,7 +1556,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(117), - target: TransformTarget::Callable(DeclarationId(1739)), + target: TransformTarget::Callable(DeclarationId(1741)), inputs: vec![], output: PortId(168), span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), @@ -1624,7 +1624,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(125), - target: TransformTarget::Callable(DeclarationId(1740)), + target: TransformTarget::Callable(DeclarationId(1742)), inputs: vec![PortId(174), PortId(176)], output: PortId(177), span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), @@ -1871,7 +1871,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(141), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(199)], output: PortId(200), span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983), @@ -1918,7 +1918,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(146), - target: TransformTarget::Callable(DeclarationId(1741)), + target: TransformTarget::Callable(DeclarationId(1743)), inputs: vec![PortId(205), PortId(206)], output: PortId(207), span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), @@ -2015,7 +2015,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(153), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(213)], output: PortId(214), span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254), @@ -2079,7 +2079,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(160), - target: TransformTarget::Callable(DeclarationId(1724)), + target: TransformTarget::Callable(DeclarationId(1726)), inputs: vec![PortId(222)], output: PortId(223), span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416), @@ -2162,7 +2162,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(165), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(227)], output: PortId(228), span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720), @@ -2263,7 +2263,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(176), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(241)], output: PortId(242), span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010), @@ -2735,7 +2735,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(291)], output: PortId(292), span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421), @@ -2830,7 +2830,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(216), - target: TransformTarget::Callable(DeclarationId(1742)), + target: TransformTarget::Callable(DeclarationId(1744)), inputs: vec![], output: PortId(305), span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), @@ -2898,7 +2898,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(224), - target: TransformTarget::Callable(DeclarationId(1743)), + target: TransformTarget::Callable(DeclarationId(1745)), inputs: vec![PortId(311), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), @@ -2987,7 +2987,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(230), - target: TransformTarget::Callable(DeclarationId(1745)), + target: TransformTarget::Callable(DeclarationId(1747)), inputs: vec![PortId(318), PortId(320)], output: PortId(321), span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), @@ -3008,7 +3008,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(233), - target: TransformTarget::Callable(DeclarationId(1746)), + target: TransformTarget::Callable(DeclarationId(1748)), inputs: vec![PortId(319), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), @@ -3051,14 +3051,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(236), - target: TransformTarget::Callable(DeclarationId(1747)), + target: TransformTarget::Callable(DeclarationId(1749)), inputs: vec![], output: PortId(327), span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(237), - target: TransformTarget::Callable(DeclarationId(1749)), + target: TransformTarget::Callable(DeclarationId(1751)), inputs: vec![PortId(326), PortId(327)], output: PortId(328), span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), @@ -3076,7 +3076,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(239), target: TransformTarget::FieldProject { field_label: "nodes".to_string(), - field_child: Some(DeclarationId(1680)), + field_child: Some(DeclarationId(1682)), }, inputs: vec![PortId(329)], output: PortId(330), @@ -3644,7 +3644,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_dag_declarations() -> Vec { { - let mut declarations = Vec::with_capacity(2265); + let mut declarations = Vec::with_capacity(2267); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -16092,11 +16092,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Empty".to_string(), - ty: DeclarationId(1499), + ty: DeclarationId(1501), }, Field { label: "Cons".to_string(), - ty: DeclarationId(1501), + ty: DeclarationId(1503), }, ], }, @@ -16129,7 +16129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1469), + output: DeclarationId(1471), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), }, type_params: vec![DeclarationId(607)], @@ -16160,8 +16160,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(608), name: Some("cons".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(609), DeclarationId(1470)], - output: DeclarationId(1471), + inputs: vec![DeclarationId(609), DeclarationId(1472)], + output: DeclarationId(1473), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), }, type_params: vec![DeclarationId(609)], @@ -16193,7 +16193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("singleton".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(611)], - output: DeclarationId(1472), + output: DeclarationId(1474), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, type_params: vec![DeclarationId(611)], @@ -16224,7 +16224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(612), name: Some("fold".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1473), DeclarationId(614), DeclarationId(1474)], + inputs: vec![DeclarationId(1475), DeclarationId(614), DeclarationId(1476)], output: DeclarationId(614), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, @@ -16270,7 +16270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(615), name: Some("fold_right".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1475), DeclarationId(617), DeclarationId(1476)], + inputs: vec![DeclarationId(1477), DeclarationId(617), DeclarationId(1478)], output: DeclarationId(617), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, @@ -16316,8 +16316,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(618), name: Some("concat".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1477), DeclarationId(1478)], - output: DeclarationId(1479), + inputs: vec![DeclarationId(1479), DeclarationId(1480)], + output: DeclarationId(1481), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)), }, type_params: vec![DeclarationId(619)], @@ -16348,8 +16348,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(620), name: Some("map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1480), DeclarationId(1481)], - output: DeclarationId(1482), + inputs: vec![DeclarationId(1482), DeclarationId(1483)], + output: DeclarationId(1484), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)), }, type_params: vec![DeclarationId(621), DeclarationId(622)], @@ -16394,8 +16394,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(623), name: Some("filter".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1483), DeclarationId(1484)], - output: DeclarationId(1485), + inputs: vec![DeclarationId(1485), DeclarationId(1486)], + output: DeclarationId(1487), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)), }, type_params: vec![DeclarationId(624)], @@ -16426,8 +16426,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(625), name: Some("flat_map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1486), DeclarationId(1488)], - output: DeclarationId(1489), + inputs: vec![DeclarationId(1488), DeclarationId(1490)], + output: DeclarationId(1491), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)), }, type_params: vec![DeclarationId(626), DeclarationId(627)], @@ -16472,7 +16472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(628), name: Some("length".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1490)], + inputs: vec![DeclarationId(1492)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)), }, @@ -16504,7 +16504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(630), name: Some("is_empty".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1491)], + inputs: vec![DeclarationId(1493)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)), }, @@ -16575,8 +16575,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(634), name: Some("enumerate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1492)], - output: DeclarationId(1494), + inputs: vec![DeclarationId(1494)], + output: DeclarationId(1496), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)), }, type_params: vec![DeclarationId(635)], @@ -16607,8 +16607,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(636), name: Some("enumerate_helper".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1495), DeclarationId(81)], - output: DeclarationId(1497), + inputs: vec![DeclarationId(1497), DeclarationId(81)], + output: DeclarationId(1499), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), }, type_params: vec![DeclarationId(637)], @@ -16639,7 +16639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(638), name: Some("contains".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1498), DeclarationId(639)], + inputs: vec![DeclarationId(1500), DeclarationId(639)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -16734,7 +16734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), - ty: DeclarationId(1502), + ty: DeclarationId(1504), }, ], }, @@ -16777,7 +16777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), - ty: DeclarationId(1503), + ty: DeclarationId(1505), }, ], }, @@ -16812,11 +16812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralToken".to_string(), - ty: DeclarationId(1518), + ty: DeclarationId(1520), }, Field { label: "ParamToken".to_string(), - ty: DeclarationId(1519), + ty: DeclarationId(1521), }, ], }, @@ -16836,7 +16836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1520), + ty: DeclarationId(1522), }], }, type_params: vec![], @@ -16856,11 +16856,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedSegmentTokens".to_string(), - ty: DeclarationId(1522), + ty: DeclarationId(1524), }, Field { label: "MalformedPathSegment".to_string(), - ty: DeclarationId(1523), + ty: DeclarationId(1525), }, ], }, @@ -16881,11 +16881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedPathTemplate".to_string(), - ty: DeclarationId(1524), + ty: DeclarationId(1526), }, Field { label: "MalformedPathTemplate".to_string(), - ty: DeclarationId(1525), + ty: DeclarationId(1527), }, ], }, @@ -16940,7 +16940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("last_path_param".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(649)], - output: DeclarationId(1504), + output: DeclarationId(1506), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, type_params: vec![], @@ -16960,15 +16960,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ReadEffect".to_string(), - ty: DeclarationId(1526), + ty: DeclarationId(1528), }, Field { label: "UpsertEffect".to_string(), - ty: DeclarationId(1527), + ty: DeclarationId(1529), }, Field { label: "DeleteEffect".to_string(), - ty: DeclarationId(1528), + ty: DeclarationId(1530), }, ], }, @@ -16989,11 +16989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CreateEffect".to_string(), - ty: DeclarationId(1529), + ty: DeclarationId(1531), }, Field { label: "AppendEffect".to_string(), - ty: DeclarationId(1530), + ty: DeclarationId(1532), }, ], }, @@ -17014,11 +17014,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IsIdempotent".to_string(), - ty: DeclarationId(1531), + ty: DeclarationId(1533), }, Field { label: "IsBreaking".to_string(), - ty: DeclarationId(1532), + ty: DeclarationId(1534), }, ], }, @@ -17039,11 +17039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PostAlways".to_string(), - ty: DeclarationId(1533), + ty: DeclarationId(1535), }, Field { label: "KeylessFallback".to_string(), - ty: DeclarationId(1534), + ty: DeclarationId(1536), }, ], }, @@ -17064,15 +17064,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PathParam".to_string(), - ty: DeclarationId(1535), + ty: DeclarationId(1537), }, Field { label: "InputField".to_string(), - ty: DeclarationId(1536), + ty: DeclarationId(1538), }, Field { label: "CompositeKey".to_string(), - ty: DeclarationId(1538), + ty: DeclarationId(1540), }, ], }, @@ -17093,15 +17093,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LatticeEffect".to_string(), - ty: DeclarationId(1539), + ty: DeclarationId(1541), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1540), + ty: DeclarationId(1542), }, Field { label: "NonIdempotent".to_string(), - ty: DeclarationId(1541), + ty: DeclarationId(1543), }, ], }, @@ -17183,15 +17183,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DerivedEffect".to_string(), - ty: DeclarationId(1542), + ty: DeclarationId(1544), }, Field { label: "UnknownHttpMethodInput".to_string(), - ty: DeclarationId(1543), + ty: DeclarationId(1545), }, Field { label: "MalformedPathInput".to_string(), - ty: DeclarationId(1544), + ty: DeclarationId(1546), }, ], }, @@ -17212,11 +17212,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IdempotentComposition".to_string(), - ty: DeclarationId(1545), + ty: DeclarationId(1547), }, Field { label: "BrokenBy".to_string(), - ty: DeclarationId(1547), + ty: DeclarationId(1549), }, ], }, @@ -17253,7 +17253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("breaker_ref".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(1505), + output: DeclarationId(1507), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)), }, type_params: vec![], @@ -17270,8 +17270,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(668), name: Some("indexed_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1506)], - output: DeclarationId(1508), + inputs: vec![DeclarationId(1508)], + output: DeclarationId(1510), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)), }, type_params: vec![], @@ -17288,8 +17288,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(669), name: Some("first_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1509)], - output: DeclarationId(1511), + inputs: vec![DeclarationId(1511)], + output: DeclarationId(1513), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)), }, type_params: vec![], @@ -17306,7 +17306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(670), name: Some("compose_effects".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1512)], + inputs: vec![DeclarationId(1514)], output: DeclarationId(665), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, @@ -17371,19 +17371,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LinearEffect".to_string(), - ty: DeclarationId(1549), + ty: DeclarationId(1551), }, Field { label: "BranchEffect".to_string(), - ty: DeclarationId(1551), + ty: DeclarationId(1553), }, Field { label: "LoopEffect".to_string(), - ty: DeclarationId(1552), + ty: DeclarationId(1554), }, Field { label: "ParallelEffect".to_string(), - ty: DeclarationId(1554), + ty: DeclarationId(1556), }, ], }, @@ -17433,11 +17433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WorkflowCompositionVerdict".to_string(), - ty: DeclarationId(1555), + ty: DeclarationId(1557), }, Field { label: "IdempotencyUnsupported".to_string(), - ty: DeclarationId(1556), + ty: DeclarationId(1558), }, ], }, @@ -17476,23 +17476,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoWorkflowProjection".to_string(), - ty: DeclarationId(1557), + ty: DeclarationId(1559), }, Field { label: "NotParallelEffectRoot".to_string(), - ty: DeclarationId(1558), + ty: DeclarationId(1560), }, Field { label: "NonLinearParallelBranch".to_string(), - ty: DeclarationId(1559), + ty: DeclarationId(1561), }, Field { label: "PairwiseNonCommute".to_string(), - ty: DeclarationId(1560), + ty: DeclarationId(1562), }, Field { label: "LensSurfacePending".to_string(), - ty: DeclarationId(1561), + ty: DeclarationId(1563), }, ], }, @@ -17542,11 +17542,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParallelCompositionVerdict".to_string(), - ty: DeclarationId(1562), + ty: DeclarationId(1564), }, Field { label: "ParallelismUnsupported".to_string(), - ty: DeclarationId(1563), + ty: DeclarationId(1565), }, ], }, @@ -17601,7 +17601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("parse_http_method".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], - output: DeclarationId(1513), + output: DeclarationId(1515), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)), }, type_params: vec![], @@ -17636,7 +17636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(684), name: Some("upsert_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1514), DeclarationId(167)], + inputs: vec![DeclarationId(1516), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, @@ -17654,7 +17654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(685), name: Some("delete_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1515), DeclarationId(167)], + inputs: vec![DeclarationId(1517), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, @@ -17711,15 +17711,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Agrees".to_string(), - ty: DeclarationId(1564), + ty: DeclarationId(1566), }, Field { label: "Disagrees".to_string(), - ty: DeclarationId(1565), + ty: DeclarationId(1567), }, Field { label: "DerivationUnknown".to_string(), - ty: DeclarationId(1566), + ty: DeclarationId(1568), }, ], }, @@ -17740,11 +17740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ModifierNotDeclared".to_string(), - ty: DeclarationId(1567), + ty: DeclarationId(1569), }, Field { label: "ModifierDeclared".to_string(), - ty: DeclarationId(1568), + ty: DeclarationId(1570), }, ], }, @@ -17882,8 +17882,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(695), name: Some("generate_idempotency_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1516)], - output: DeclarationId(1517), + inputs: vec![DeclarationId(1518)], + output: DeclarationId(1519), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)), }, type_params: vec![], @@ -17951,15 +17951,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Uninferred".to_string(), - ty: DeclarationId(1576), + ty: DeclarationId(1578), }, Field { label: "Resolved".to_string(), - ty: DeclarationId(1577), + ty: DeclarationId(1579), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(1578), + ty: DeclarationId(1580), }, ], }, @@ -17988,7 +17988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "produced_by".to_string(), - ty: DeclarationId(1579), + ty: DeclarationId(1581), }, ], }, @@ -18009,15 +18009,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LitInt".to_string(), - ty: DeclarationId(1580), + ty: DeclarationId(1582), }, Field { label: "LitBool".to_string(), - ty: DeclarationId(1581), + ty: DeclarationId(1583), }, Field { label: "LitString".to_string(), - ty: DeclarationId(1582), + ty: DeclarationId(1584), }, ], }, @@ -18038,23 +18038,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1583), + ty: DeclarationId(1585), }, Field { label: "UnresolvedIdentifier".to_string(), - ty: DeclarationId(1584), + ty: DeclarationId(1586), }, Field { label: "ResolvedByStructure".to_string(), - ty: DeclarationId(1585), + ty: DeclarationId(1587), }, Field { label: "ResolvedByName".to_string(), - ty: DeclarationId(1586), + ty: DeclarationId(1588), }, Field { label: "TypeParam".to_string(), - ty: DeclarationId(1587), + ty: DeclarationId(1589), }, ], }, @@ -18075,15 +18075,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OneUnit".to_string(), - ty: DeclarationId(1588), + ty: DeclarationId(1590), }, Field { label: "AdditionalUnit".to_string(), - ty: DeclarationId(1589), + ty: DeclarationId(1591), }, Field { label: "UnitCount".to_string(), - ty: DeclarationId(1590), + ty: DeclarationId(1592), }, ], }, @@ -18104,11 +18104,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ZeroWidth".to_string(), - ty: DeclarationId(1591), + ty: DeclarationId(1593), }, Field { label: "PositiveWidth".to_string(), - ty: DeclarationId(1592), + ty: DeclarationId(1594), }, ], }, @@ -18129,11 +18129,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundedInterval".to_string(), - ty: DeclarationId(1593), + ty: DeclarationId(1595), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1594), + ty: DeclarationId(1596), }, ], }, @@ -18188,11 +18188,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StaticBound".to_string(), - ty: DeclarationId(1596), + ty: DeclarationId(1598), }, Field { label: "PlatformDependent".to_string(), - ty: DeclarationId(1597), + ty: DeclarationId(1599), }, ], }, @@ -18213,15 +18213,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Exact".to_string(), - ty: DeclarationId(1598), + ty: DeclarationId(1600), }, Field { label: "AtMostOne".to_string(), - ty: DeclarationId(1599), + ty: DeclarationId(1601), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1600), + ty: DeclarationId(1602), }, ], }, @@ -18317,27 +18317,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1601), + ty: DeclarationId(1603), }, Field { label: "Reference".to_string(), - ty: DeclarationId(1602), + ty: DeclarationId(1604), }, Field { label: "Record".to_string(), - ty: DeclarationId(1604), + ty: DeclarationId(1606), }, Field { label: "List".to_string(), - ty: DeclarationId(1606), + ty: DeclarationId(1608), }, Field { label: "Map".to_string(), - ty: DeclarationId(1608), + ty: DeclarationId(1610), }, Field { label: "Variant".to_string(), - ty: DeclarationId(1610), + ty: DeclarationId(1612), }, ], }, @@ -18358,15 +18358,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueBodyUnparsed".to_string(), - ty: DeclarationId(1611), + ty: DeclarationId(1613), }, Field { label: "ValueBodyStructural".to_string(), - ty: DeclarationId(1613), + ty: DeclarationId(1615), }, Field { label: "ValueBodyMap".to_string(), - ty: DeclarationId(1615), + ty: DeclarationId(1617), }, ], }, @@ -18387,23 +18387,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserDefined".to_string(), - ty: DeclarationId(1616), + ty: DeclarationId(1618), }, Field { label: "ExternalRealization".to_string(), - ty: DeclarationId(1617), + ty: DeclarationId(1619), }, Field { label: "Pending".to_string(), - ty: DeclarationId(1618), + ty: DeclarationId(1620), }, Field { label: "NoBody".to_string(), - ty: DeclarationId(1619), + ty: DeclarationId(1621), }, Field { label: "Unparsed".to_string(), - ty: DeclarationId(1620), + ty: DeclarationId(1622), }, ], }, @@ -18424,27 +18424,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Atom".to_string(), - ty: DeclarationId(1621), + ty: DeclarationId(1623), }, Field { label: "Conj".to_string(), - ty: DeclarationId(1623), + ty: DeclarationId(1625), }, Field { label: "Disj".to_string(), - ty: DeclarationId(1625), + ty: DeclarationId(1627), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(1627), + ty: DeclarationId(1629), }, Field { label: "Cardinality".to_string(), - ty: DeclarationId(1628), + ty: DeclarationId(1630), }, Field { label: "Instantiation".to_string(), - ty: DeclarationId(1630), + ty: DeclarationId(1632), }, ], }, @@ -18469,7 +18469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), - ty: DeclarationId(1631), + ty: DeclarationId(1633), }, Field { label: "connective".to_string(), @@ -18477,27 +18477,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(1632), + ty: DeclarationId(1634), }, Field { label: "phantom_params".to_string(), - ty: DeclarationId(1633), + ty: DeclarationId(1635), }, Field { label: "meta_tag".to_string(), - ty: DeclarationId(1634), + ty: DeclarationId(1636), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(1635), + ty: DeclarationId(1637), }, Field { label: "value_body".to_string(), - ty: DeclarationId(1636), + ty: DeclarationId(1638), }, Field { label: "nominal_opacity".to_string(), - ty: DeclarationId(1637), + ty: DeclarationId(1639), }, Field { label: "span".to_string(), @@ -18546,7 +18546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "permitted_accessors".to_string(), - ty: DeclarationId(1638), + ty: DeclarationId(1640), }], }, type_params: vec![], @@ -18566,19 +18566,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Add".to_string(), - ty: DeclarationId(1639), + ty: DeclarationId(1641), }, Field { label: "Sub".to_string(), - ty: DeclarationId(1640), + ty: DeclarationId(1642), }, Field { label: "Mul".to_string(), - ty: DeclarationId(1641), + ty: DeclarationId(1643), }, Field { label: "Div".to_string(), - ty: DeclarationId(1642), + ty: DeclarationId(1644), }, ], }, @@ -18599,27 +18599,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Eq".to_string(), - ty: DeclarationId(1643), + ty: DeclarationId(1645), }, Field { label: "Ne".to_string(), - ty: DeclarationId(1644), + ty: DeclarationId(1646), }, Field { label: "Lt".to_string(), - ty: DeclarationId(1645), + ty: DeclarationId(1647), }, Field { label: "Le".to_string(), - ty: DeclarationId(1646), + ty: DeclarationId(1648), }, Field { label: "Gt".to_string(), - ty: DeclarationId(1647), + ty: DeclarationId(1649), }, Field { label: "Ge".to_string(), - ty: DeclarationId(1648), + ty: DeclarationId(1650), }, ], }, @@ -18640,11 +18640,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "And".to_string(), - ty: DeclarationId(1649), + ty: DeclarationId(1651), }, Field { label: "Or".to_string(), - ty: DeclarationId(1650), + ty: DeclarationId(1652), }, ], }, @@ -18665,15 +18665,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Arithmetic".to_string(), - ty: DeclarationId(1651), + ty: DeclarationId(1653), }, Field { label: "Comparison".to_string(), - ty: DeclarationId(1652), + ty: DeclarationId(1654), }, Field { label: "Logical".to_string(), - ty: DeclarationId(1653), + ty: DeclarationId(1655), }, ], }, @@ -18694,15 +18694,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Callable".to_string(), - ty: DeclarationId(1654), + ty: DeclarationId(1656), }, Field { label: "FieldProject".to_string(), - ty: DeclarationId(1656), + ty: DeclarationId(1658), }, Field { label: "Operator".to_string(), - ty: DeclarationId(1657), + ty: DeclarationId(1659), }, ], }, @@ -18723,11 +18723,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnresolvedVariant".to_string(), - ty: DeclarationId(1658), + ty: DeclarationId(1660), }, Field { label: "ResolvedVariant".to_string(), - ty: DeclarationId(1659), + ty: DeclarationId(1661), }, ], }, @@ -18785,7 +18785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "binding".to_string(), - ty: DeclarationId(1660), + ty: DeclarationId(1662), }, ], }, @@ -18921,11 +18921,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "members".to_string(), - ty: DeclarationId(1661), + ty: DeclarationId(1663), }, Field { label: "intra_cluster_calls".to_string(), - ty: DeclarationId(1662), + ty: DeclarationId(1664), }, ], }, @@ -18946,11 +18946,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Cardinality".to_string(), - ty: DeclarationId(1663), + ty: DeclarationId(1665), }, Field { label: "Descent".to_string(), - ty: DeclarationId(1664), + ty: DeclarationId(1666), }, ], }, @@ -19005,7 +19005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1665), + ty: DeclarationId(1667), }, ], }, @@ -19034,7 +19034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "inputs".to_string(), - ty: DeclarationId(1666), + ty: DeclarationId(1668), }, Field { label: "result_port".to_string(), @@ -19062,7 +19062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserMatch".to_string(), - ty: DeclarationId(1667), + ty: DeclarationId(1669), }], }, type_params: vec![], @@ -19090,7 +19090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "paths".to_string(), - ty: DeclarationId(1668), + ty: DeclarationId(1670), }, Field { label: "result_port".to_string(), @@ -19102,7 +19102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1669), + ty: DeclarationId(1671), }, ], }, @@ -19167,7 +19167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserCallable".to_string(), - ty: DeclarationId(1670), + ty: DeclarationId(1672), }], }, type_params: vec![], @@ -19199,7 +19199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "params".to_string(), - ty: DeclarationId(1671), + ty: DeclarationId(1673), }, Field { label: "span".to_string(), @@ -19207,11 +19207,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1672), + ty: DeclarationId(1674), }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1673), + ty: DeclarationId(1675), }, ], }, @@ -19232,23 +19232,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Value".to_string(), - ty: DeclarationId(1674), + ty: DeclarationId(1676), }, Field { label: "Transform".to_string(), - ty: DeclarationId(1675), + ty: DeclarationId(1677), }, Field { label: "Branch".to_string(), - ty: DeclarationId(1676), + ty: DeclarationId(1678), }, Field { label: "Loop".to_string(), - ty: DeclarationId(1677), + ty: DeclarationId(1679), }, Field { label: "Bind".to_string(), - ty: DeclarationId(1678), + ty: DeclarationId(1680), }, ], }, @@ -19269,19 +19269,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "declarations".to_string(), - ty: DeclarationId(1679), + ty: DeclarationId(1681), }, Field { label: "nodes".to_string(), - ty: DeclarationId(1680), + ty: DeclarationId(1682), }, Field { label: "ports".to_string(), - ty: DeclarationId(1681), + ty: DeclarationId(1683), }, Field { label: "clusters".to_string(), - ty: DeclarationId(1682), + ty: DeclarationId(1684), }, ], }, @@ -19321,15 +19321,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "accessor".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "realization".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -19348,7 +19348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("port".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(641)], - output: DeclarationId(1569), + output: DeclarationId(1571), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 18579, @@ -19370,7 +19370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("node".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(640)], - output: DeclarationId(1570), + output: DeclarationId(1572), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 18637, @@ -19392,7 +19392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("resolve_producer".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(641)], - output: DeclarationId(1571), + output: DeclarationId(1573), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 18712, @@ -19414,7 +19414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("declaration_by_id".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(642)], - output: DeclarationId(1572), + output: DeclarationId(1574), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19101, @@ -19436,7 +19436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("lane2_workflow_at".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(640)], - output: DeclarationId(1573), + output: DeclarationId(1575), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19425, @@ -19460,15 +19460,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleRoot".to_string(), - ty: DeclarationId(1683), + ty: DeclarationId(1685), }, Field { label: "NoRoot".to_string(), - ty: DeclarationId(1684), + ty: DeclarationId(1686), }, Field { label: "AmbiguousRoot".to_string(), - ty: DeclarationId(1686), + ty: DeclarationId(1688), }, ], }, @@ -19509,7 +19509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1574), + output: DeclarationId(1576), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23430, @@ -19531,7 +19531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(642)], - output: DeclarationId(1575), + output: DeclarationId(1577), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23515, @@ -19554,7 +19554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -19574,15 +19574,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShrinkEffect".to_string(), - ty: DeclarationId(1706), + ty: DeclarationId(1708), }, Field { label: "ProjectionEffect".to_string(), - ty: DeclarationId(1707), + ty: DeclarationId(1709), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1708), + ty: DeclarationId(1710), }, ], }, @@ -19603,19 +19603,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShapeConstant".to_string(), - ty: DeclarationId(1709), + ty: DeclarationId(1711), }, Field { label: "ShapeLinearScan".to_string(), - ty: DeclarationId(1710), + ty: DeclarationId(1712), }, Field { label: "ShapeIterateBody".to_string(), - ty: DeclarationId(1711), + ty: DeclarationId(1713), }, Field { label: "ShapeSortBody".to_string(), - ty: DeclarationId(1712), + ty: DeclarationId(1714), }, ], }, @@ -19644,15 +19644,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "size_effect".to_string(), - ty: DeclarationId(1713), + ty: DeclarationId(1715), }, Field { label: "cost_shape".to_string(), - ty: DeclarationId(1714), + ty: DeclarationId(1716), }, Field { label: "callback_element_position".to_string(), - ty: DeclarationId(1715), + ty: DeclarationId(1717), }, ], }, @@ -19692,11 +19692,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DegreeTwo".to_string(), - ty: DeclarationId(1716), + ty: DeclarationId(1718), }, Field { label: "DegreeSuccessor".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(1719), }, ], }, @@ -19717,31 +19717,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantCost".to_string(), - ty: DeclarationId(1718), + ty: DeclarationId(1720), }, Field { label: "LinearCost".to_string(), - ty: DeclarationId(1719), + ty: DeclarationId(1721), }, Field { label: "PolynomialCost".to_string(), - ty: DeclarationId(1720), + ty: DeclarationId(1722), }, Field { label: "ProductCost".to_string(), - ty: DeclarationId(1722), + ty: DeclarationId(1724), }, Field { label: "SumCost".to_string(), - ty: DeclarationId(1724), + ty: DeclarationId(1726), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(1725), + ty: DeclarationId(1727), }, Field { label: "UnknownCost".to_string(), - ty: DeclarationId(1726), + ty: DeclarationId(1728), }, ], }, @@ -19803,7 +19803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1687), + output: DeclarationId(1689), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9870, 9880)), }, type_params: vec![], @@ -19821,7 +19821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(762)], - output: DeclarationId(1688), + output: DeclarationId(1690), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9954, 9969)), }, type_params: vec![], @@ -19839,7 +19839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("two_terms".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(762), DeclarationId(762)], - output: DeclarationId(1689), + output: DeclarationId(1691), body: ArrowBody::UserDefined(NodeId(10)), }, type_params: vec![], @@ -19856,8 +19856,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(768), name: Some("many_terms".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1690)], - output: DeclarationId(1691), + inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1692)], + output: DeclarationId(1693), body: ArrowBody::UserDefined(NodeId(12)), }, type_params: vec![], @@ -19982,7 +19982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(775), name: Some("max_path".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1692)], + inputs: vec![DeclarationId(1694)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(45)), }, @@ -20054,8 +20054,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(779), name: Some("nsl_to_list".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1693)], - output: DeclarationId(1694), + inputs: vec![DeclarationId(1695)], + output: DeclarationId(1696), body: ArrowBody::UserDefined(NodeId(116)), }, type_params: vec![], @@ -20072,8 +20072,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(780), name: Some("drop_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1695)], - output: DeclarationId(1696), + inputs: vec![DeclarationId(1697)], + output: DeclarationId(1698), body: ArrowBody::UserDefined(NodeId(129)), }, type_params: vec![], @@ -20108,7 +20108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(782), name: Some("reduce_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1697)], + inputs: vec![DeclarationId(1699)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(151)), }, @@ -20126,7 +20126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(783), name: Some("wrap_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1698)], + inputs: vec![DeclarationId(1700)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(163)), }, @@ -20144,7 +20144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(784), name: Some("reduce_product".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1699)], + inputs: vec![DeclarationId(1701)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(180)), }, @@ -20293,8 +20293,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(792), name: Some("filter_not_dominated_by".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1700), DeclarationId(762)], - output: DeclarationId(1701), + inputs: vec![DeclarationId(1702), DeclarationId(762)], + output: DeclarationId(1703), body: ArrowBody::UserDefined(NodeId(228)), }, type_params: vec![], @@ -20311,8 +20311,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(793), name: Some("drop_dominated_step".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1702), DeclarationId(762)], - output: DeclarationId(1703), + inputs: vec![DeclarationId(1704), DeclarationId(762)], + output: DeclarationId(1705), body: ArrowBody::UserDefined(NodeId(235)), }, type_params: vec![], @@ -20329,8 +20329,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(794), name: Some("drop_dominated".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1704)], - output: DeclarationId(1705), + inputs: vec![DeclarationId(1706)], + output: DeclarationId(1707), body: ArrowBody::UserDefined(NodeId(238)), }, type_params: vec![], @@ -20350,10 +20350,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inputs: vec![ DeclarationId(118), DeclarationId(197), - DeclarationId(1750), - DeclarationId(81), - DeclarationId(1751), DeclarationId(1752), + DeclarationId(81), + DeclarationId(1753), + DeclarationId(1754), ], output: DeclarationId(803), body: ArrowBody::Unparsed(SourceSpan::new( @@ -20379,12 +20379,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1027), + value: DeclarationId(1029), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1753)), + meta_tag: Some(DeclarationId(1755)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![])), @@ -20399,11 +20399,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserMessage".to_string(), - ty: DeclarationId(1755), + ty: DeclarationId(1757), }, Field { label: "AssistantMessage".to_string(), - ty: DeclarationId(1757), + ty: DeclarationId(1759), }, ], }, @@ -20424,11 +20424,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserTextBlock".to_string(), - ty: DeclarationId(1758), + ty: DeclarationId(1760), }, Field { label: "UserToolResultBlock".to_string(), - ty: DeclarationId(1760), + ty: DeclarationId(1762), }, ], }, @@ -20449,11 +20449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AssistantTextBlock".to_string(), - ty: DeclarationId(1761), + ty: DeclarationId(1763), }, Field { label: "AssistantToolUseBlock".to_string(), - ty: DeclarationId(1762), + ty: DeclarationId(1764), }, ], }, @@ -20474,31 +20474,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EndTurn".to_string(), - ty: DeclarationId(1763), + ty: DeclarationId(1765), }, Field { label: "MaxTokens".to_string(), - ty: DeclarationId(1764), + ty: DeclarationId(1766), }, Field { label: "StopSequence".to_string(), - ty: DeclarationId(1765), + ty: DeclarationId(1767), }, Field { label: "ToolUse".to_string(), - ty: DeclarationId(1766), + ty: DeclarationId(1768), }, Field { label: "PauseTurn".to_string(), - ty: DeclarationId(1767), + ty: DeclarationId(1769), }, Field { label: "Refusal".to_string(), - ty: DeclarationId(1768), + ty: DeclarationId(1770), }, Field { label: "ModelContextWindowExceeded".to_string(), - ty: DeclarationId(1769), + ty: DeclarationId(1771), }, ], }, @@ -20581,7 +20581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "content".to_string(), - ty: DeclarationId(1770), + ty: DeclarationId(1772), }, Field { label: "model".to_string(), @@ -20593,7 +20593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "stop_sequence".to_string(), - ty: DeclarationId(1771), + ty: DeclarationId(1773), }, Field { label: "usage".to_string(), @@ -20618,23 +20618,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ToNearestEven".to_string(), - ty: DeclarationId(1772), + ty: DeclarationId(1774), }, Field { label: "ToZero".to_string(), - ty: DeclarationId(1773), + ty: DeclarationId(1775), }, Field { label: "ToPositiveInfinity".to_string(), - ty: DeclarationId(1774), + ty: DeclarationId(1776), }, Field { label: "ToNegativeInfinity".to_string(), - ty: DeclarationId(1775), + ty: DeclarationId(1777), }, Field { label: "ToAwayFromZero".to_string(), - ty: DeclarationId(1776), + ty: DeclarationId(1778), }, ], }, @@ -20655,15 +20655,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Unbounded".to_string(), - ty: DeclarationId(1777), + ty: DeclarationId(1779), }, Field { label: "BinaryPrecision".to_string(), - ty: DeclarationId(1778), + ty: DeclarationId(1780), }, Field { label: "DecimalPrecision".to_string(), - ty: DeclarationId(1779), + ty: DeclarationId(1781), }, ], }, @@ -20684,15 +20684,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoNaN".to_string(), - ty: DeclarationId(1780), + ty: DeclarationId(1782), }, Field { label: "QuietNaN".to_string(), - ty: DeclarationId(1781), + ty: DeclarationId(1783), }, Field { label: "QuietAndSignalingNaN".to_string(), - ty: DeclarationId(1782), + ty: DeclarationId(1784), }, ], }, @@ -20713,11 +20713,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoInfinity".to_string(), - ty: DeclarationId(1783), + ty: DeclarationId(1785), }, Field { label: "SignedInfinity".to_string(), - ty: DeclarationId(1784), + ty: DeclarationId(1786), }, ], }, @@ -20738,11 +20738,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoSignedZero".to_string(), - ty: DeclarationId(1785), + ty: DeclarationId(1787), }, Field { label: "SignedZero".to_string(), - ty: DeclarationId(1786), + ty: DeclarationId(1788), }, ], }, @@ -20763,15 +20763,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoSubnormals".to_string(), - ty: DeclarationId(1787), + ty: DeclarationId(1789), }, Field { label: "GradualUnderflow".to_string(), - ty: DeclarationId(1788), + ty: DeclarationId(1790), }, Field { label: "FlushToZero".to_string(), - ty: DeclarationId(1789), + ty: DeclarationId(1791), }, ], }, @@ -20821,7 +20821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "base".to_string(), - ty: DeclarationId(1790), + ty: DeclarationId(1792), }, Field { label: "rounding".to_string(), @@ -20880,7 +20880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "entry".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -20901,11 +20901,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Retired".to_string(), - ty: DeclarationId(1791), + ty: DeclarationId(1793), }, Field { label: "Open".to_string(), - ty: DeclarationId(1792), + ty: DeclarationId(1794), }, ], }, @@ -20925,7 +20925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -20971,7 +20971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5984, 6094), }); - declarations.push(Declaration { id: DeclarationId(817), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(816) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1793)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); + declarations.push(Declaration { id: DeclarationId(817), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(816) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1795)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1793), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1793), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); declarations.push(Declaration { id: DeclarationId(818), name: Some("CleanEmissionContract".to_string()), @@ -21057,15 +21057,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapEverything".to_string(), - ty: DeclarationId(1794), + ty: DeclarationId(1796), }, Field { label: "WrapOnlyInOperandPosition".to_string(), - ty: DeclarationId(1795), + ty: DeclarationId(1797), }, Field { label: "NoWrapping".to_string(), - ty: DeclarationId(1796), + ty: DeclarationId(1798), }, ], }, @@ -21086,19 +21086,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitBindingAlways".to_string(), - ty: DeclarationId(1797), + ty: DeclarationId(1799), }, Field { label: "EmitUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1798), + ty: DeclarationId(1800), }, Field { label: "EmitPrefixedUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1799), + ty: DeclarationId(1801), }, Field { label: "NotApplicablePatternBinding".to_string(), - ty: DeclarationId(1800), + ty: DeclarationId(1802), }, ], }, @@ -21119,11 +21119,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AccessFromPayloadBinding".to_string(), - ty: DeclarationId(1801), + ty: DeclarationId(1803), }, Field { label: "OverrideNamedFieldsAtBindingSite".to_string(), - ty: DeclarationId(1802), + ty: DeclarationId(1804), }, ], }, @@ -21144,15 +21144,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ImportEverythingDeclared".to_string(), - ty: DeclarationId(1803), + ty: DeclarationId(1805), }, Field { label: "IncludeOnlyReferenced".to_string(), - ty: DeclarationId(1804), + ty: DeclarationId(1806), }, Field { label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(1805), + ty: DeclarationId(1807), }, ], }, @@ -21173,15 +21173,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapReturnValue".to_string(), - ty: DeclarationId(1806), + ty: DeclarationId(1808), }, Field { label: "NoWrappingOnTerminalExpression".to_string(), - ty: DeclarationId(1807), + ty: DeclarationId(1809), }, Field { label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(1808), + ty: DeclarationId(1810), }, ], }, @@ -21202,15 +21202,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitLetBindingAlways".to_string(), - ty: DeclarationId(1809), + ty: DeclarationId(1811), }, Field { label: "EmitLetUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1810), + ty: DeclarationId(1812), }, Field { label: "OmitLetBinding".to_string(), - ty: DeclarationId(1811), + ty: DeclarationId(1813), }, ], }, @@ -21231,15 +21231,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapBody".to_string(), - ty: DeclarationId(1812), + ty: DeclarationId(1814), }, Field { label: "NoWrappingOnNonComplexBody".to_string(), - ty: DeclarationId(1813), + ty: DeclarationId(1815), }, Field { label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(1814), + ty: DeclarationId(1816), }, ], }, @@ -21297,7 +21297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(1815), + ty: DeclarationId(1817), }, Field { label: "syntax_only".to_string(), @@ -21330,19 +21330,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IgnoreVerifierOutput".to_string(), - ty: DeclarationId(1816), + ty: DeclarationId(1818), }, Field { label: "RequireEmptyStdout".to_string(), - ty: DeclarationId(1817), + ty: DeclarationId(1819), }, Field { label: "RequireEmptyStderr".to_string(), - ty: DeclarationId(1818), + ty: DeclarationId(1820), }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), - ty: DeclarationId(1819), + ty: DeclarationId(1821), }, ], }, @@ -21363,35 +21363,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CollectionSize".to_string(), - ty: DeclarationId(1824), + ty: DeclarationId(1826), }, Field { label: "ParserStreamSize".to_string(), - ty: DeclarationId(1825), + ty: DeclarationId(1827), }, Field { label: "WorklistDrainSize".to_string(), - ty: DeclarationId(1826), + ty: DeclarationId(1828), }, Field { label: "TreeSize".to_string(), - ty: DeclarationId(1827), + ty: DeclarationId(1829), }, Field { label: "ArithmeticParam".to_string(), - ty: DeclarationId(1828), + ty: DeclarationId(1830), }, Field { label: "ExplicitCountZero".to_string(), - ty: DeclarationId(1829), + ty: DeclarationId(1831), }, Field { label: "ExplicitCountPositive".to_string(), - ty: DeclarationId(1830), + ty: DeclarationId(1832), }, Field { label: "Forever".to_string(), - ty: DeclarationId(1831), + ty: DeclarationId(1833), }, ], }, @@ -21431,7 +21431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(832), name: Some("positive_descent_count".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1036)], + inputs: vec![DeclarationId(1038)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", @@ -21456,35 +21456,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ChildAccessorCall".to_string(), - ty: DeclarationId(1832), + ty: DeclarationId(1834), }, Field { label: "CollectionShrinkCall".to_string(), - ty: DeclarationId(1833), + ty: DeclarationId(1835), }, Field { label: "ArithmeticSubtractCall".to_string(), - ty: DeclarationId(1834), + ty: DeclarationId(1836), }, Field { label: "ArithmeticDivideCall".to_string(), - ty: DeclarationId(1835), + ty: DeclarationId(1837), }, Field { label: "ParserAdvanceCall".to_string(), - ty: DeclarationId(1836), + ty: DeclarationId(1838), }, Field { label: "WorklistDrainCall".to_string(), - ty: DeclarationId(1837), + ty: DeclarationId(1839), }, Field { label: "FoldBodyCall".to_string(), - ty: DeclarationId(1838), + ty: DeclarationId(1840), }, Field { label: "SameArgumentCall".to_string(), - ty: DeclarationId(1839), + ty: DeclarationId(1841), }, ], }, @@ -21505,15 +21505,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnitShrink".to_string(), - ty: DeclarationId(1840), + ty: DeclarationId(1842), }, Field { label: "ConstantShrink".to_string(), - ty: DeclarationId(1841), + ty: DeclarationId(1843), }, Field { label: "ProportionalShrink".to_string(), - ty: DeclarationId(1842), + ty: DeclarationId(1844), }, ], }, @@ -21534,15 +21534,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Fold".to_string(), - ty: DeclarationId(1843), + ty: DeclarationId(1845), }, Field { label: "Descend".to_string(), - ty: DeclarationId(1844), + ty: DeclarationId(1846), }, Field { label: "Repeat".to_string(), - ty: DeclarationId(1845), + ty: DeclarationId(1847), }, ], }, @@ -21571,11 +21571,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), - ty: DeclarationId(1028), + ty: DeclarationId(1030), }, Field { label: "factor".to_string(), - ty: DeclarationId(1846), + ty: DeclarationId(1848), }, ], }, @@ -21616,7 +21616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("size_bound_param".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(830)], - output: DeclarationId(1820), + output: DeclarationId(1822), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5369, @@ -21682,7 +21682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("constant_bound_value".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(830)], - output: DeclarationId(1821), + output: DeclarationId(1823), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6297, @@ -21706,15 +21706,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TreeDescent".to_string(), - ty: DeclarationId(1847), + ty: DeclarationId(1849), }, Field { label: "CollectionFold".to_string(), - ty: DeclarationId(1848), + ty: DeclarationId(1850), }, Field { label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(1849), + ty: DeclarationId(1851), }, ], }, @@ -21733,7 +21733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("algebra_profile_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(53)], - output: DeclarationId(1822), + output: DeclarationId(1824), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7370, @@ -21755,7 +21755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("type_iteration_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], - output: DeclarationId(1823), + output: DeclarationId(1825), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7935, @@ -21779,11 +21779,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Immutable".to_string(), - ty: DeclarationId(1850), + ty: DeclarationId(1852), }, Field { label: "Mutable".to_string(), - ty: DeclarationId(1851), + ty: DeclarationId(1853), }, ], }, @@ -21804,11 +21804,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Pure".to_string(), - ty: DeclarationId(1852), + ty: DeclarationId(1854), }, Field { label: "Effectful".to_string(), - ty: DeclarationId(1853), + ty: DeclarationId(1855), }, ], }, @@ -21829,11 +21829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ExplicitDAG".to_string(), - ty: DeclarationId(1854), + ty: DeclarationId(1856), }, Field { label: "Arbitrary".to_string(), - ty: DeclarationId(1855), + ty: DeclarationId(1857), }, ], }, @@ -21854,11 +21854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Bounded".to_string(), - ty: DeclarationId(1856), + ty: DeclarationId(1858), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1857), + ty: DeclarationId(1859), }, ], }, @@ -21922,28 +21922,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "mutability".to_string(), FieldValue::Variant { - constructor: DeclarationId(1850), + constructor: DeclarationId(1852), payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { - constructor: DeclarationId(1852), + constructor: DeclarationId(1854), payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { - constructor: DeclarationId(1854), + constructor: DeclarationId(1856), payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { - constructor: DeclarationId(1856), + constructor: DeclarationId(1858), payload: vec![], }, ), @@ -21960,19 +21960,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueOnly".to_string(), - ty: DeclarationId(1858), + ty: DeclarationId(1860), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(1859), + ty: DeclarationId(1861), }, Field { label: "RefCounted".to_string(), - ty: DeclarationId(1860), + ty: DeclarationId(1862), }, Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(1861), + ty: DeclarationId(1863), }, ], }, @@ -21993,11 +21993,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LexicalScoping".to_string(), - ty: DeclarationId(1862), + ty: DeclarationId(1864), }, Field { label: "DynamicScoping".to_string(), - ty: DeclarationId(1863), + ty: DeclarationId(1865), }, ], }, @@ -22042,7 +22042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "excluded_prefixes".to_string(), - ty: DeclarationId(1864), + ty: DeclarationId(1866), }], }, type_params: vec![], @@ -22066,7 +22066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "additional_excluded_prefixes".to_string(), - ty: DeclarationId(1865), + ty: DeclarationId(1867), }, ], }, @@ -22114,11 +22114,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(1866), + ty: DeclarationId(1868), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(1867), + ty: DeclarationId(1869), }, ], }, @@ -22139,31 +22139,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TokenizerError".to_string(), - ty: DeclarationId(1868), + ty: DeclarationId(1870), }, Field { label: "ParseError".to_string(), - ty: DeclarationId(1869), + ty: DeclarationId(1871), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(1870), + ty: DeclarationId(1872), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(1871), + ty: DeclarationId(1873), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(1872), + ty: DeclarationId(1874), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(1873), + ty: DeclarationId(1875), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(1874), + ty: DeclarationId(1876), }, ], }, @@ -22237,7 +22237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "kind_decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -22257,11 +22257,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CompilerKind".to_string(), - ty: DeclarationId(1875), + ty: DeclarationId(1877), }, Field { label: "LensInstanceKind".to_string(), - ty: DeclarationId(1876), + ty: DeclarationId(1878), }, ], }, @@ -22294,7 +22294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fixes".to_string(), - ty: DeclarationId(1877), + ty: DeclarationId(1879), }, ], }, @@ -22315,31 +22315,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnderRefined".to_string(), - ty: DeclarationId(1878), + ty: DeclarationId(1880), }, Field { label: "NoInhabitant".to_string(), - ty: DeclarationId(1879), + ty: DeclarationId(1881), }, Field { label: "ContradictoryUse".to_string(), - ty: DeclarationId(1881), + ty: DeclarationId(1883), }, Field { label: "OutOfR2Scope".to_string(), - ty: DeclarationId(1882), + ty: DeclarationId(1884), }, Field { label: "LifetimeProgramExtractionPending".to_string(), - ty: DeclarationId(1883), + ty: DeclarationId(1885), }, Field { label: "FoldNotImplemented".to_string(), - ty: DeclarationId(1884), + ty: DeclarationId(1886), }, Field { label: "MissingEmissionPath".to_string(), - ty: DeclarationId(1885), + ty: DeclarationId(1887), }, ], }, @@ -22360,11 +22360,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Inhabits".to_string(), - ty: DeclarationId(1900), + ty: DeclarationId(1902), }, Field { label: "Violates".to_string(), - ty: DeclarationId(1901), + ty: DeclarationId(1903), }, ], }, @@ -22399,11 +22399,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoDiagnostic".to_string(), - ty: DeclarationId(1902), + ty: DeclarationId(1904), }, Field { label: "SomeDiagnostic".to_string(), - ty: DeclarationId(1903), + ty: DeclarationId(1905), }, ], }, @@ -22424,11 +22424,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DimensionOk".to_string(), - ty: DeclarationId(1906), + ty: DeclarationId(1908), }, Field { label: "DimensionFail".to_string(), - ty: DeclarationId(1910), + ty: DeclarationId(1912), }, ], }, @@ -22467,11 +22467,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witness_of".to_string(), - ty: DeclarationId(1912), + ty: DeclarationId(1914), }, Field { label: "compose".to_string(), - ty: DeclarationId(1913), + ty: DeclarationId(1915), }, Field { label: "identity".to_string(), @@ -22479,7 +22479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "break_diagnostic".to_string(), - ty: DeclarationId(1914), + ty: DeclarationId(1916), }, ], }, @@ -22519,7 +22519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { type_params: vec![DeclarationId(873), DeclarationId(874)], phantom_params: vec![PhantomParameter { parameter: DeclarationId(873), - algebra: DeclarationId(1915), + algebra: DeclarationId(1917), }], meta_tag: None, specialization_parent: None, @@ -22660,11 +22660,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("add_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(1886), - DeclarationId(1887), DeclarationId(1888), + DeclarationId(1889), + DeclarationId(1890), ], - output: DeclarationId(1889), + output: DeclarationId(1891), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4316, 4338)), }, type_params: vec![DeclarationId(883), DeclarationId(884)], @@ -22710,11 +22710,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(1890), - DeclarationId(1891), DeclarationId(1892), + DeclarationId(1893), + DeclarationId(1894), ], - output: DeclarationId(1893), + output: DeclarationId(1895), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4512, 4534)), }, type_params: vec![DeclarationId(886), DeclarationId(887)], @@ -22759,8 +22759,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(888), name: Some("mul_dimension_scalar".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1894), DeclarationId(1895), DeclarationId(890)], - output: DeclarationId(1896), + inputs: vec![DeclarationId(1896), DeclarationId(1897), DeclarationId(890)], + output: DeclarationId(1898), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4700, 4729)), }, type_params: vec![DeclarationId(889), DeclarationId(890)], @@ -22805,8 +22805,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(891), name: Some("div_dimension_scalar".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1897), DeclarationId(1898), DeclarationId(893)], - output: DeclarationId(1899), + inputs: vec![DeclarationId(1899), DeclarationId(1900), DeclarationId(893)], + output: DeclarationId(1901), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4895, 4924)), }, type_params: vec![DeclarationId(892), DeclarationId(893)], @@ -22854,11 +22854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -22870,7 +22870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(1916), + ty: DeclarationId(1918), }, Field { label: "cost".to_string(), @@ -22895,15 +22895,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "kernel_integer".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "algebra".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "bound".to_string(), @@ -22911,7 +22911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_realization".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -22932,11 +22932,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundUnspecified".to_string(), - ty: DeclarationId(1917), + ty: DeclarationId(1919), }, Field { label: "StaticBoundFact".to_string(), - ty: DeclarationId(1918), + ty: DeclarationId(1920), }, ], }, @@ -22986,11 +22986,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectField".to_string(), - ty: DeclarationId(1919), + ty: DeclarationId(1921), }, Field { label: "AccessorMethod".to_string(), - ty: DeclarationId(1920), + ty: DeclarationId(1922), }, ], }, @@ -23011,15 +23011,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "op".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -23048,11 +23048,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -23081,11 +23081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "strategy".to_string(), @@ -23093,7 +23093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "parameters".to_string(), - ty: DeclarationId(1921), + ty: DeclarationId(1923), }, Field { label: "cost".to_string(), @@ -23143,11 +23143,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrowed".to_string(), - ty: DeclarationId(1922), + ty: DeclarationId(1924), }, Field { label: "Consumed".to_string(), - ty: DeclarationId(1923), + ty: DeclarationId(1925), }, ], }, @@ -23168,11 +23168,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Owned".to_string(), - ty: DeclarationId(1924), + ty: DeclarationId(1926), }, Field { label: "Borrowed".to_string(), - ty: DeclarationId(1925), + ty: DeclarationId(1927), }, ], }, @@ -23193,11 +23193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SelfContained".to_string(), - ty: DeclarationId(1926), + ty: DeclarationId(1928), }, Field { label: "Caller".to_string(), - ty: DeclarationId(1927), + ty: DeclarationId(1929), }, ], }, @@ -23218,15 +23218,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Growable".to_string(), - ty: DeclarationId(1928), + ty: DeclarationId(1930), }, Field { label: "Fixed".to_string(), - ty: DeclarationId(1929), + ty: DeclarationId(1931), }, Field { label: "NotApplicable".to_string(), - ty: DeclarationId(1930), + ty: DeclarationId(1932), }, ], }, @@ -23246,7 +23246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "Utf8FreeMonoidChar".to_string(), - ty: DeclarationId(1931), + ty: DeclarationId(1933), }], }, type_params: vec![], @@ -23266,11 +23266,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -23299,43 +23299,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ListEmpty".to_string(), - ty: DeclarationId(1932), + ty: DeclarationId(1934), }, Field { label: "ListSingleton".to_string(), - ty: DeclarationId(1933), + ty: DeclarationId(1935), }, Field { label: "ListCons".to_string(), - ty: DeclarationId(1934), + ty: DeclarationId(1936), }, Field { label: "ListConcat".to_string(), - ty: DeclarationId(1935), + ty: DeclarationId(1937), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(1936), + ty: DeclarationId(1938), }, Field { label: "ListIsEmpty".to_string(), - ty: DeclarationId(1937), + ty: DeclarationId(1939), }, Field { label: "ListFold".to_string(), - ty: DeclarationId(1938), + ty: DeclarationId(1940), }, Field { label: "ListMap".to_string(), - ty: DeclarationId(1939), + ty: DeclarationId(1941), }, Field { label: "ListFilter".to_string(), - ty: DeclarationId(1940), + ty: DeclarationId(1942), }, Field { label: "ListContains".to_string(), - ty: DeclarationId(1941), + ty: DeclarationId(1943), }, ], }, @@ -23356,11 +23356,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "strategy".to_string(), @@ -23368,11 +23368,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "empty_variant".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "cons_variant".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "scrutinee".to_string(), @@ -23417,11 +23417,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PlaceholderPatternStrategy".to_string(), - ty: DeclarationId(1942), + ty: DeclarationId(1944), }, Field { label: "VectorList".to_string(), - ty: DeclarationId(1943), + ty: DeclarationId(1945), }, ], }, @@ -23884,11 +23884,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrow".to_string(), - ty: DeclarationId(1944), + ty: DeclarationId(1946), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(1945), + ty: DeclarationId(1947), }, ], }, @@ -23909,11 +23909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CopyOrClone".to_string(), - ty: DeclarationId(1946), + ty: DeclarationId(1948), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(1947), + ty: DeclarationId(1949), }, ], }, @@ -23934,51 +23934,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "statements".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "expressions".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "control_flow".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "literals".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "modules".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "functions".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "type_applications".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "type_definitions".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "record_derive_templates".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "patterns".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "collection_ops".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "values".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -23999,11 +23999,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IndexedArgs".to_string(), - ty: DeclarationId(1948), + ty: DeclarationId(1950), }, Field { label: "NamedArg".to_string(), - ty: DeclarationId(1949), + ty: DeclarationId(1951), }, ], }, @@ -24024,11 +24024,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleTemplate".to_string(), - ty: DeclarationId(1950), + ty: DeclarationId(1952), }, Field { label: "HigherOrderTemplates".to_string(), - ty: DeclarationId(1951), + ty: DeclarationId(1953), }, ], }, @@ -24212,7 +24212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1952)), + meta_tag: Some(DeclarationId(1954)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -24231,7 +24231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -24244,7 +24244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24266,7 +24266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -24279,7 +24279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24301,7 +24301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -24314,7 +24314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24336,7 +24336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg}...)".to_string(), ))], @@ -24349,7 +24349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24371,7 +24371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Map({recv}, {arg})".to_string(), ))], @@ -24384,7 +24384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24406,7 +24406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -24419,7 +24419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24441,7 +24441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -24454,7 +24454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24476,7 +24476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -24489,7 +24489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24511,7 +24511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -24524,7 +24524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24544,7 +24544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -24557,7 +24557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24577,7 +24577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -24590,7 +24590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24612,7 +24612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Fold({recv}, {arg})".to_string(), ))], @@ -24625,7 +24625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24647,7 +24647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -24660,7 +24660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24682,7 +24682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -24695,7 +24695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24712,23 +24712,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectRecursion".to_string(), - ty: DeclarationId(1962), + ty: DeclarationId(1964), }, Field { label: "ListRecursion".to_string(), - ty: DeclarationId(1963), + ty: DeclarationId(1965), }, Field { label: "OptionalRecursion".to_string(), - ty: DeclarationId(1964), + ty: DeclarationId(1966), }, Field { label: "SetRecursion".to_string(), - ty: DeclarationId(1965), + ty: DeclarationId(1967), }, Field { label: "MapValueRecursion".to_string(), - ty: DeclarationId(1966), + ty: DeclarationId(1968), }, ], }, @@ -24820,7 +24820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("inductive_field_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(937), DeclarationId(197)], - output: DeclarationId(1035), + output: DeclarationId(1037), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)), }, type_params: vec![], @@ -24840,23 +24840,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StrictSubValue".to_string(), - ty: DeclarationId(1967), + ty: DeclarationId(1969), }, Field { label: "IteratedSubValue".to_string(), - ty: DeclarationId(1968), + ty: DeclarationId(1970), }, Field { label: "ArithmeticDescent".to_string(), - ty: DeclarationId(1969), + ty: DeclarationId(1971), }, Field { label: "PreservedValue".to_string(), - ty: DeclarationId(1970), + ty: DeclarationId(1972), }, Field { label: "SubValueUnknown".to_string(), - ty: DeclarationId(1971), + ty: DeclarationId(1973), }, ], }, @@ -24875,7 +24875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_evidence".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(941)], - output: DeclarationId(1028), + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 11067, @@ -25007,7 +25007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_call_pattern".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(941)], - output: DeclarationId(1953), + output: DeclarationId(1955), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20455, @@ -25029,7 +25029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_lowering_target".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(941)], - output: DeclarationId(1954), + output: DeclarationId(1956), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21843, @@ -25053,19 +25053,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IntegerExpZero".to_string(), - ty: DeclarationId(1972), + ty: DeclarationId(1974), }, Field { label: "IntegerExpPos".to_string(), - ty: DeclarationId(1973), + ty: DeclarationId(1975), }, Field { label: "FractionExp".to_string(), - ty: DeclarationId(1974), + ty: DeclarationId(1976), }, Field { label: "LogBasedExp".to_string(), - ty: DeclarationId(1975), + ty: DeclarationId(1977), }, ], }, @@ -25108,11 +25108,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PolyCost".to_string(), - ty: DeclarationId(1976), + ty: DeclarationId(1978), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(1977), + ty: DeclarationId(1979), }, ], }, @@ -25133,31 +25133,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantBound".to_string(), - ty: DeclarationId(1978), + ty: DeclarationId(1980), }, Field { label: "AtomicBound".to_string(), - ty: DeclarationId(1979), + ty: DeclarationId(1981), }, Field { label: "ProductBound".to_string(), - ty: DeclarationId(1981), + ty: DeclarationId(1983), }, Field { label: "SumOfProductsBound".to_string(), - ty: DeclarationId(1984), + ty: DeclarationId(1986), }, Field { label: "SumBound".to_string(), - ty: DeclarationId(1986), + ty: DeclarationId(1988), }, Field { label: "ForeverBound".to_string(), - ty: DeclarationId(1987), + ty: DeclarationId(1989), }, Field { label: "ErrorBound".to_string(), - ty: DeclarationId(1988), + ty: DeclarationId(1990), }, ], }, @@ -25175,7 +25175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(954), name: Some("sum_bound".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1955)], + inputs: vec![DeclarationId(1957)], output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -25451,7 +25451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_add_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1956), + output: DeclarationId(1958), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31892, @@ -25473,7 +25473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_mul_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1957), + output: DeclarationId(1959), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 32188, @@ -25495,7 +25495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("bounded_int_pow_exponent".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(1958), + output: DeclarationId(1960), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33437, @@ -25517,7 +25517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_pow_bounded".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1959), + output: DeclarationId(1961), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33912, @@ -25539,7 +25539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("ceil_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1960), + output: DeclarationId(1962), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35175, @@ -25566,7 +25566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(81), DeclarationId(81), ], - output: DeclarationId(1961), + output: DeclarationId(1963), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35447, @@ -25969,12 +25969,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1989)), + meta_tag: Some(DeclarationId(1991)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -25995,12 +25995,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1990)), + meta_tag: Some(DeclarationId(1992)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -26025,23 +26025,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "read".to_string(), - ty: DeclarationId(1992), + ty: DeclarationId(1994), }, Field { label: "sequential".to_string(), - ty: DeclarationId(1993), + ty: DeclarationId(1995), }, Field { label: "branch".to_string(), - ty: DeclarationId(1994), + ty: DeclarationId(1996), }, Field { label: "iterate".to_string(), - ty: DeclarationId(1995), + ty: DeclarationId(1997), }, Field { label: "validate".to_string(), - ty: DeclarationId(1996), + ty: DeclarationId(1998), }, ], }, @@ -26076,11 +26076,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Miss".to_string(), - ty: DeclarationId(1999), + ty: DeclarationId(2001), }, Field { label: "Hit".to_string(), - ty: DeclarationId(2000), + ty: DeclarationId(2002), }, ], }, @@ -26113,7 +26113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1997), + output: DeclarationId(1999), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)), }, type_params: vec![], @@ -26131,7 +26131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(1998), + output: DeclarationId(2000), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)), }, type_params: vec![], @@ -26169,7 +26169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "items".to_string(), - ty: DeclarationId(2001), + ty: DeclarationId(2003), }], }, type_params: vec![], @@ -26197,7 +26197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), - ty: DeclarationId(2002), + ty: DeclarationId(2004), }, ], }, @@ -26272,11 +26272,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Positional".to_string(), - ty: DeclarationId(2004), + ty: DeclarationId(2006), }, Field { label: "Record".to_string(), - ty: DeclarationId(2006), + ty: DeclarationId(2008), }, ], }, @@ -26297,19 +26297,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Named".to_string(), - ty: DeclarationId(2007), + ty: DeclarationId(2009), }, Field { label: "Parameterized".to_string(), - ty: DeclarationId(2009), + ty: DeclarationId(2011), }, Field { label: "Optional".to_string(), - ty: DeclarationId(2010), + ty: DeclarationId(2012), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2012), + ty: DeclarationId(2014), }, ], }, @@ -26450,15 +26450,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BareVariant".to_string(), - ty: DeclarationId(2013), + ty: DeclarationId(2015), }, Field { label: "VariantWith".to_string(), - ty: DeclarationId(2014), + ty: DeclarationId(2016), }, Field { label: "VariantFields".to_string(), - ty: DeclarationId(2016), + ty: DeclarationId(2018), }, ], }, @@ -26479,15 +26479,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Int".to_string(), - ty: DeclarationId(2017), + ty: DeclarationId(2019), }, Field { label: "Bool".to_string(), - ty: DeclarationId(2018), + ty: DeclarationId(2020), }, Field { label: "String".to_string(), - ty: DeclarationId(2019), + ty: DeclarationId(2021), }, ], }, @@ -26508,51 +26508,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(2020), + ty: DeclarationId(2022), }, Field { label: "Var".to_string(), - ty: DeclarationId(2021), + ty: DeclarationId(2023), }, Field { label: "Path".to_string(), - ty: DeclarationId(2024), + ty: DeclarationId(2026), }, Field { label: "Call".to_string(), - ty: DeclarationId(2026), + ty: DeclarationId(2028), }, Field { label: "VariantRecord".to_string(), - ty: DeclarationId(2028), + ty: DeclarationId(2030), }, Field { label: "Operator".to_string(), - ty: DeclarationId(2030), + ty: DeclarationId(2032), }, Field { label: "Lambda".to_string(), - ty: DeclarationId(2032), + ty: DeclarationId(2034), }, Field { label: "If".to_string(), - ty: DeclarationId(2033), + ty: DeclarationId(2035), }, Field { label: "Match".to_string(), - ty: DeclarationId(2035), + ty: DeclarationId(2037), }, Field { label: "Record".to_string(), - ty: DeclarationId(2037), + ty: DeclarationId(2039), }, Field { label: "List".to_string(), - ty: DeclarationId(2039), + ty: DeclarationId(2041), }, Field { label: "Map".to_string(), - ty: DeclarationId(2041), + ty: DeclarationId(2043), }, ], }, @@ -26573,43 +26573,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Let".to_string(), - ty: DeclarationId(2043), + ty: DeclarationId(2045), }, Field { label: "Fn".to_string(), - ty: DeclarationId(2046), + ty: DeclarationId(2048), }, Field { label: "FnExternalBody".to_string(), - ty: DeclarationId(2049), + ty: DeclarationId(2051), }, Field { label: "Data".to_string(), - ty: DeclarationId(2051), + ty: DeclarationId(2053), }, Field { label: "Module".to_string(), - ty: DeclarationId(2053), + ty: DeclarationId(2055), }, Field { label: "Import".to_string(), - ty: DeclarationId(2056), + ty: DeclarationId(2058), }, Field { label: "TypeAtom".to_string(), - ty: DeclarationId(2058), + ty: DeclarationId(2060), }, Field { label: "TypeRecord".to_string(), - ty: DeclarationId(2061), + ty: DeclarationId(2063), }, Field { label: "TypeSum".to_string(), - ty: DeclarationId(2065), + ty: DeclarationId(2067), }, Field { label: "TypeAlias".to_string(), - ty: DeclarationId(2068), + ty: DeclarationId(2070), }, ], }, @@ -26635,7 +26635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2069)), + meta_tag: Some(DeclarationId(2071)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -26654,7 +26654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -26667,7 +26667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26687,7 +26687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -26700,7 +26700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26720,7 +26720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -26733,7 +26733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26755,7 +26755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -26768,7 +26768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26790,7 +26790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -26803,7 +26803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26825,7 +26825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -26838,7 +26838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26860,7 +26860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -26873,7 +26873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26893,7 +26893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + {arg}".to_string(), ))], @@ -26906,7 +26906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26928,7 +26928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[{arg}(x) for x in {recv}]".to_string(), ))], @@ -26941,7 +26941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26963,7 +26963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -26976,7 +26976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26998,7 +26998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -27011,7 +27011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27033,7 +27033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -27046,7 +27046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27068,7 +27068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -27081,7 +27081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27101,7 +27101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -27114,7 +27114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27134,7 +27134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -27147,7 +27147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27169,7 +27169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "functools.reduce({arg}, {recv})".to_string(), ))], @@ -27182,7 +27182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27204,7 +27204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -27217,7 +27217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27237,7 +27237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -27250,7 +27250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27303,7 +27303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -27348,23 +27348,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralValue".to_string(), - ty: DeclarationId(2070), + ty: DeclarationId(2072), }, Field { label: "RecordValue".to_string(), - ty: DeclarationId(2072), + ty: DeclarationId(2074), }, Field { label: "VariantValue".to_string(), - ty: DeclarationId(2073), + ty: DeclarationId(2075), }, Field { label: "NodeRef".to_string(), - ty: DeclarationId(2074), + ty: DeclarationId(2076), }, Field { label: "CardinalityValue".to_string(), - ty: DeclarationId(2075), + ty: DeclarationId(2077), }, ], }, @@ -27417,7 +27417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "bindings".to_string(), - ty: DeclarationId(2076), + ty: DeclarationId(2078), }], }, type_params: vec![], @@ -27436,7 +27436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "frames".to_string(), - ty: DeclarationId(2077), + ty: DeclarationId(2079), }], }, type_params: vec![], @@ -27447,15 +27447,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 4548, 4597), + span: SourceSpan::new("src/v3/std/runtime.dag", 4505, 4554), }); declarations.push(Declaration { id: DeclarationId(1021), + name: Some("EvalStateKey".to_string()), + connective: TypeConnective::Conj { + children: vec![Field { + label: "state".to_string(), + ty: DeclarationId(1020), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/runtime.dag", 4935, 4980), + }); + declarations.push(Declaration { + id: DeclarationId(1022), name: Some("EvalStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "ApplicativeOrder".to_string(), - ty: DeclarationId(2078), + ty: DeclarationId(2080), }], }, type_params: vec![], @@ -27466,15 +27485,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5002, 5076), + span: SourceSpan::new("src/v3/std/runtime.dag", 5385, 5459), }); declarations.push(Declaration { - id: DeclarationId(1022), + id: DeclarationId(1023), name: Some("InputEvaluationOrder".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "LeftFirst".to_string(), - ty: DeclarationId(2079), + ty: DeclarationId(2081), }], }, type_params: vec![], @@ -27485,11 +27504,44 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5313, 5350), + span: SourceSpan::new("src/v3/std/runtime.dag", 5696, 5733), }); - declarations.push(Declaration { id: DeclarationId(1023), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2080)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); declarations.push(Declaration { id: DeclarationId(1024), + name: Some("EvalMemoKey".to_string()), + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "program".to_string(), + ty: DeclarationId(642), + }, + Field { + label: "node".to_string(), + ty: DeclarationId(640), + }, + Field { + label: "state_key".to_string(), + ty: DeclarationId(1021), + }, + Field { + label: "strategy".to_string(), + ty: DeclarationId(1022), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153), + }); + declarations.push(Declaration { id: DeclarationId(1025), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2082)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); + declarations.push(Declaration { + id: DeclarationId(1026), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -27503,7 +27555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704), }); declarations.push(Declaration { - id: DeclarationId(1025), + id: DeclarationId(1027), name: Some("RestEndpointBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -27528,12 +27580,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 4653, 4725), }); declarations.push(Declaration { - id: DeclarationId(1026), + id: DeclarationId(1028), name: Some("CallableRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -27547,21 +27599,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 5533, 5576), }); declarations.push(Declaration { - id: DeclarationId(1027), + id: DeclarationId(1029), name: Some("Operation".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "callable".to_string(), - ty: DeclarationId(1026), + ty: DeclarationId(1028), }, Field { label: "inputs".to_string(), - ty: DeclarationId(2081), + ty: DeclarationId(2083), }, Field { label: "endpoint".to_string(), - ty: DeclarationId(1025), + ty: DeclarationId(1027), }, ], }, @@ -27576,21 +27628,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6785, 6895), }); declarations.push(Declaration { - id: DeclarationId(1028), + id: DeclarationId(1030), name: Some("DescentEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Strict".to_string(), - ty: DeclarationId(2089), + ty: DeclarationId(2091), }, Field { label: "NonIncreasing".to_string(), - ty: DeclarationId(2090), + ty: DeclarationId(2092), }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2091), + ty: DeclarationId(2093), }, ], }, @@ -27605,10 +27657,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 642, 710), }); declarations.push(Declaration { - id: DeclarationId(1029), + id: DeclarationId(1031), name: Some("evidence_rank".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028)], + inputs: vec![DeclarationId(1030)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)), }, @@ -27623,11 +27675,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 712, 838), }); declarations.push(Declaration { - id: DeclarationId(1030), + id: DeclarationId(1032), name: Some("merge_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028), DeclarationId(1028)], - output: DeclarationId(1028), + inputs: vec![DeclarationId(1030), DeclarationId(1030)], + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)), }, type_params: vec![], @@ -27641,11 +27693,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 905, 1310), }); declarations.push(Declaration { - id: DeclarationId(1031), + id: DeclarationId(1033), name: Some("join_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028), DeclarationId(1028)], - output: DeclarationId(1028), + inputs: vec![DeclarationId(1030), DeclarationId(1030)], + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1456, @@ -27663,11 +27715,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 1380, 1655), }); declarations.push(Declaration { - id: DeclarationId(1032), + id: DeclarationId(1034), name: Some("promote_to_strict".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028)], - output: DeclarationId(1028), + inputs: vec![DeclarationId(1030)], + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2117, @@ -27685,11 +27737,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2050, 2236), }); declarations.push(Declaration { - id: DeclarationId(1033), + id: DeclarationId(1035), name: Some("optional_evidence_meet".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2082), DeclarationId(2083)], - output: DeclarationId(2084), + inputs: vec![DeclarationId(2084), DeclarationId(2085)], + output: DeclarationId(2086), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2388, @@ -27707,11 +27759,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2300, 2564), }); declarations.push(Declaration { - id: DeclarationId(1034), + id: DeclarationId(1036), name: Some("map_evidence_merge_at".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2085), DeclarationId(197), DeclarationId(1028)], - output: DeclarationId(2086), + inputs: vec![DeclarationId(2087), DeclarationId(197), DeclarationId(1030)], + output: DeclarationId(2088), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2733, @@ -27729,29 +27781,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2601, 2907), }); declarations.push(Declaration { - id: DeclarationId(1035), + id: DeclarationId(1037), name: Some("RankingDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeSize".to_string(), - ty: DeclarationId(2092), + ty: DeclarationId(2094), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(2093), + ty: DeclarationId(2095), }, Field { label: "ArithmeticValue".to_string(), - ty: DeclarationId(2094), + ty: DeclarationId(2096), }, Field { label: "TokenPosition".to_string(), - ty: DeclarationId(2095), + ty: DeclarationId(2097), }, Field { label: "SetCardinality".to_string(), - ty: DeclarationId(2096), + ty: DeclarationId(2098), }, ], }, @@ -27766,17 +27818,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3206, 3402), }); declarations.push(Declaration { - id: DeclarationId(1036), + id: DeclarationId(1038), name: Some("PositiveDescentAmount".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OneStep".to_string(), - ty: DeclarationId(2097), + ty: DeclarationId(2099), }, Field { label: "AdditionalStep".to_string(), - ty: DeclarationId(2098), + ty: DeclarationId(2100), }, ], }, @@ -27791,17 +27843,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4378, 4471), }); declarations.push(Declaration { - id: DeclarationId(1037), + id: DeclarationId(1039), name: Some("ProportionalDivisor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DivideByTwo".to_string(), - ty: DeclarationId(2099), + ty: DeclarationId(2101), }, Field { label: "StrictlyLarger".to_string(), - ty: DeclarationId(2100), + ty: DeclarationId(2102), }, ], }, @@ -27816,10 +27868,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4937, 5027), }); declarations.push(Declaration { - id: DeclarationId(1038), + id: DeclarationId(1040), name: Some("proportional_divisor_to_int".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1037)], + inputs: vec![DeclarationId(1039)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -27838,7 +27890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5029, 5204), }); declarations.push(Declaration { - id: DeclarationId(1039), + id: DeclarationId(1041), name: Some("peano_literal_materialization_cap".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -27860,11 +27912,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5388, 5441), }); declarations.push(Declaration { - id: DeclarationId(1040), + id: DeclarationId(1042), name: Some("positive_descent_amount_from_positive_int".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(2087), + output: DeclarationId(2089), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 5902, @@ -27882,11 +27934,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5823, 6262), }); declarations.push(Declaration { - id: DeclarationId(1041), + id: DeclarationId(1043), name: Some("proportional_divisor_from_int_at_least_two".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(2088), + output: DeclarationId(2090), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6342, @@ -27904,37 +27956,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6264, 6703), }); declarations.push(Declaration { - id: DeclarationId(1042), + id: DeclarationId(1044), name: Some("DescentSource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessor".to_string(), - ty: DeclarationId(2101), + ty: DeclarationId(2103), }, Field { label: "ListShrink".to_string(), - ty: DeclarationId(2102), + ty: DeclarationId(2104), }, Field { label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2103), + ty: DeclarationId(2105), }, Field { label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2104), + ty: DeclarationId(2106), }, Field { label: "ParserAdvance".to_string(), - ty: DeclarationId(2105), + ty: DeclarationId(2107), }, Field { label: "SetRemoval".to_string(), - ty: DeclarationId(2106), + ty: DeclarationId(2108), }, Field { label: "FoldIteration".to_string(), - ty: DeclarationId(2107), + ty: DeclarationId(2109), }, ], }, @@ -27949,12 +28001,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7108, 7429), }); declarations.push(Declaration { - id: DeclarationId(1043), + id: DeclarationId(1045), name: Some("TerminationProof".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "dimensions".to_string(), - ty: DeclarationId(2108), + ty: DeclarationId(2110), }], }, type_params: vec![], @@ -27968,7 +28020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7431, 7493), }); declarations.push(Declaration { - id: DeclarationId(1044), + id: DeclarationId(1046), name: Some("ProofEdge".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -27982,7 +28034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), - ty: DeclarationId(2109), + ty: DeclarationId(2111), }, ], }, @@ -27997,193 +28049,193 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7638, 7724), }); declarations.push(Declaration { - id: DeclarationId(1045), + id: DeclarationId(1047), name: Some("TokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), - ty: DeclarationId(2110), + ty: DeclarationId(2112), }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2111), + ty: DeclarationId(2113), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2112), + ty: DeclarationId(2114), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2113), + ty: DeclarationId(2115), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2114), + ty: DeclarationId(2116), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2115), + ty: DeclarationId(2117), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2116), + ty: DeclarationId(2118), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2117), + ty: DeclarationId(2119), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2118), + ty: DeclarationId(2120), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2119), + ty: DeclarationId(2121), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2122), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2121), + ty: DeclarationId(2123), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2122), + ty: DeclarationId(2124), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2123), + ty: DeclarationId(2125), }, Field { label: "Ident".to_string(), - ty: DeclarationId(2124), + ty: DeclarationId(2126), }, Field { label: "IntLit".to_string(), - ty: DeclarationId(2125), + ty: DeclarationId(2127), }, Field { label: "StringLit".to_string(), - ty: DeclarationId(2126), + ty: DeclarationId(2128), }, Field { label: "Eq".to_string(), - ty: DeclarationId(2127), + ty: DeclarationId(2129), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2128), + ty: DeclarationId(2130), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2129), + ty: DeclarationId(2131), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2130), + ty: DeclarationId(2132), }, Field { label: "Le".to_string(), - ty: DeclarationId(2131), + ty: DeclarationId(2133), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2132), + ty: DeclarationId(2134), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2133), + ty: DeclarationId(2135), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2134), + ty: DeclarationId(2136), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2135), + ty: DeclarationId(2137), }, Field { label: "Star".to_string(), - ty: DeclarationId(2136), + ty: DeclarationId(2138), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2137), + ty: DeclarationId(2139), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2138), + ty: DeclarationId(2140), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2139), + ty: DeclarationId(2141), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2140), + ty: DeclarationId(2142), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2141), + ty: DeclarationId(2143), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2142), + ty: DeclarationId(2144), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2143), + ty: DeclarationId(2145), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2144), + ty: DeclarationId(2146), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2145), + ty: DeclarationId(2147), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2146), + ty: DeclarationId(2148), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2147), + ty: DeclarationId(2149), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2148), + ty: DeclarationId(2150), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2149), + ty: DeclarationId(2151), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2150), + ty: DeclarationId(2152), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2151), + ty: DeclarationId(2153), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2152), + ty: DeclarationId(2154), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2153), + ty: DeclarationId(2155), }, Field { label: "Question".to_string(), - ty: DeclarationId(2154), + ty: DeclarationId(2156), }, Field { label: "Eof".to_string(), - ty: DeclarationId(2155), + ty: DeclarationId(2157), }, ], }, @@ -28198,13 +28250,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1151), }); declarations.push(Declaration { - id: DeclarationId(1046), + id: DeclarationId(1048), name: Some("Token".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1045), + ty: DeclarationId(1047), }, Field { label: "span".to_string(), @@ -28223,65 +28275,65 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1286, 1337), }); declarations.push(Declaration { - id: DeclarationId(1047), + id: DeclarationId(1049), name: Some("KeywordTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), - ty: DeclarationId(2156), + ty: DeclarationId(2158), }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2157), + ty: DeclarationId(2159), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2158), + ty: DeclarationId(2160), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2159), + ty: DeclarationId(2161), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2160), + ty: DeclarationId(2162), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2161), + ty: DeclarationId(2163), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2162), + ty: DeclarationId(2164), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2163), + ty: DeclarationId(2165), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2164), + ty: DeclarationId(2166), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2165), + ty: DeclarationId(2167), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2166), + ty: DeclarationId(2168), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2167), + ty: DeclarationId(2169), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2168), + ty: DeclarationId(2170), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2169), + ty: DeclarationId(2171), }, ], }, @@ -28296,121 +28348,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1696, 1876), }); declarations.push(Declaration { - id: DeclarationId(1048), + id: DeclarationId(1050), name: Some("PunctTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Eq".to_string(), - ty: DeclarationId(2170), + ty: DeclarationId(2172), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2171), + ty: DeclarationId(2173), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2172), + ty: DeclarationId(2174), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2173), + ty: DeclarationId(2175), }, Field { label: "Le".to_string(), - ty: DeclarationId(2174), + ty: DeclarationId(2176), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2175), + ty: DeclarationId(2177), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2176), + ty: DeclarationId(2178), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2177), + ty: DeclarationId(2179), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2178), + ty: DeclarationId(2180), }, Field { label: "Star".to_string(), - ty: DeclarationId(2179), + ty: DeclarationId(2181), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2180), + ty: DeclarationId(2182), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2181), + ty: DeclarationId(2183), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2182), + ty: DeclarationId(2184), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2183), + ty: DeclarationId(2185), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2184), + ty: DeclarationId(2186), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2185), + ty: DeclarationId(2187), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2186), + ty: DeclarationId(2188), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2187), + ty: DeclarationId(2189), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2188), + ty: DeclarationId(2190), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2189), + ty: DeclarationId(2191), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2190), + ty: DeclarationId(2192), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2191), + ty: DeclarationId(2193), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2192), + ty: DeclarationId(2194), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2193), + ty: DeclarationId(2195), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2194), + ty: DeclarationId(2196), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2195), + ty: DeclarationId(2197), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2196), + ty: DeclarationId(2198), }, Field { label: "Question".to_string(), - ty: DeclarationId(2197), + ty: DeclarationId(2199), }, ], }, @@ -28425,7 +28477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2292, 2598), }); declarations.push(Declaration { - id: DeclarationId(1049), + id: DeclarationId(1051), name: Some("LocalPunctSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28435,7 +28487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "kind".to_string(), - ty: DeclarationId(1048), + ty: DeclarationId(1050), }, ], }, @@ -28450,7 +28502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2808, 2872), }); declarations.push(Declaration { - id: DeclarationId(1050), + id: DeclarationId(1052), name: Some("StringEscapeSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28475,7 +28527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 3259, 3325), }); declarations.push(Declaration { - id: DeclarationId(1051), + id: DeclarationId(1053), name: Some("Path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(131), @@ -28492,7 +28544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360), }); declarations.push(Declaration { - id: DeclarationId(1052), + id: DeclarationId(1054), name: Some("SnapshotRef".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(122), @@ -28509,7 +28561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391), }); declarations.push(Declaration { - id: DeclarationId(1053), + id: DeclarationId(1055), name: Some("CensusListConstant".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28523,15 +28575,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554), }); declarations.push(Declaration { - id: DeclarationId(1054), + id: DeclarationId(1056), name: Some("expected_hand_authored_non_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1053), + template: DeclarationId(1055), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1053)), + meta_tag: Some(DeclarationId(1055)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28540,15 +28592,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617), }); declarations.push(Declaration { - id: DeclarationId(1055), + id: DeclarationId(1057), name: Some("expected_hand_authored_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1053), + template: DeclarationId(1055), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1053)), + meta_tag: Some(DeclarationId(1055)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28557,7 +28609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675), }); declarations.push(Declaration { - id: DeclarationId(1056), + id: DeclarationId(1058), name: Some("LensProducerFilesSubsetPredicate".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28571,15 +28623,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847), }); declarations.push(Declaration { - id: DeclarationId(1057), + id: DeclarationId(1059), name: Some("lens_producer_files_subset_predicate".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1056), + template: DeclarationId(1058), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1056)), + meta_tag: Some(DeclarationId(1058)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28588,7 +28640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929), }); declarations.push(Declaration { - id: DeclarationId(1058), + id: DeclarationId(1060), name: Some("CompilerStdPositiveSetRatchet".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28602,15 +28654,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045), }); declarations.push(Declaration { - id: DeclarationId(1059), + id: DeclarationId(1061), name: Some("compiler_std_positive_set_ratchet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1058), + template: DeclarationId(1060), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1058)), + meta_tag: Some(DeclarationId(1060)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28619,37 +28671,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121), }); declarations.push(Declaration { - id: DeclarationId(1060), + id: DeclarationId(1062), name: Some("DiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), - ty: DeclarationId(2201), + ty: DeclarationId(2203), }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2202), + ty: DeclarationId(2204), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2203), + ty: DeclarationId(2205), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2204), + ty: DeclarationId(2206), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2205), + ty: DeclarationId(2207), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2206), + ty: DeclarationId(2208), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2207), + ty: DeclarationId(2209), }, ], }, @@ -28664,17 +28716,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606), }); declarations.push(Declaration { - id: DeclarationId(1061), + id: DeclarationId(1063), name: Some("DiagnosticDetailExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnyDetail".to_string(), - ty: DeclarationId(2208), + ty: DeclarationId(2210), }, Field { label: "Contains".to_string(), - ty: DeclarationId(2209), + ty: DeclarationId(2211), }, ], }, @@ -28689,17 +28741,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042), }); declarations.push(Declaration { - id: DeclarationId(1062), + id: DeclarationId(1064), name: Some("DiagnosticReference".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1060), + ty: DeclarationId(1062), }, Field { label: "detail_contains".to_string(), - ty: DeclarationId(1061), + ty: DeclarationId(1063), }, ], }, @@ -28714,17 +28766,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284), }); declarations.push(Declaration { - id: DeclarationId(1063), + id: DeclarationId(1065), name: Some("PortStateExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Resolved".to_string(), - ty: DeclarationId(2210), + ty: DeclarationId(2212), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(2211), + ty: DeclarationId(2213), }, ], }, @@ -28739,21 +28791,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724), }); declarations.push(Declaration { - id: DeclarationId(1064), + id: DeclarationId(1066), name: Some("AlgebraicLawKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Associativity".to_string(), - ty: DeclarationId(2212), + ty: DeclarationId(2214), }, Field { label: "Commutativity".to_string(), - ty: DeclarationId(2213), + ty: DeclarationId(2215), }, Field { label: "Identity".to_string(), - ty: DeclarationId(2214), + ty: DeclarationId(2216), }, ], }, @@ -28768,97 +28820,97 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583), }); declarations.push(Declaration { - id: DeclarationId(1065), + id: DeclarationId(1067), name: Some("TestPredicate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Compiles".to_string(), - ty: DeclarationId(2215), + ty: DeclarationId(2217), }, Field { label: "FailsWithDiagnostic".to_string(), - ty: DeclarationId(2216), + ty: DeclarationId(2218), }, Field { label: "OutputEquals".to_string(), - ty: DeclarationId(2217), + ty: DeclarationId(2219), }, Field { label: "PortHasState".to_string(), - ty: DeclarationId(2218), + ty: DeclarationId(2220), }, Field { label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2219), + ty: DeclarationId(2221), }, Field { label: "CostBounded".to_string(), - ty: DeclarationId(2220), + ty: DeclarationId(2222), }, Field { label: "BehavioralObservation".to_string(), - ty: DeclarationId(2221), + ty: DeclarationId(2223), }, Field { label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2222), + ty: DeclarationId(2224), }, Field { label: "ExecuteCommand".to_string(), - ty: DeclarationId(2224), + ty: DeclarationId(2226), }, Field { label: "ForAllTargets".to_string(), - ty: DeclarationId(2226), + ty: DeclarationId(2228), }, Field { label: "LensOutputEquals".to_string(), - ty: DeclarationId(2227), + ty: DeclarationId(2229), }, Field { label: "DifferentialEquals".to_string(), - ty: DeclarationId(2228), + ty: DeclarationId(2230), }, Field { label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2229), + ty: DeclarationId(2231), }, Field { label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2230), + ty: DeclarationId(2232), }, Field { label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2231), + ty: DeclarationId(2233), }, Field { label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2232), + ty: DeclarationId(2234), }, Field { label: "FixedPointConverges".to_string(), - ty: DeclarationId(2233), + ty: DeclarationId(2235), }, Field { label: "RatchetZero".to_string(), - ty: DeclarationId(2234), + ty: DeclarationId(2236), }, Field { label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2236), + ty: DeclarationId(2238), }, Field { label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2237), + ty: DeclarationId(2239), }, Field { label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2238), + ty: DeclarationId(2240), }, Field { label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2239), + ty: DeclarationId(2241), }, ], }, @@ -28873,7 +28925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4585, 12806), }); declarations.push(Declaration { - id: DeclarationId(1066), + id: DeclarationId(1068), name: Some("ProgramInput".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28887,12 +28939,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12914, 12934), }); declarations.push(Declaration { - id: DeclarationId(1067), + id: DeclarationId(1069), name: Some("ProgramOutputBind".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "output_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -28906,7 +28958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13077, 13132), }); declarations.push(Declaration { - id: DeclarationId(1068), + id: DeclarationId(1070), name: Some("TestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28924,11 +28976,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "predicate".to_string(), - ty: DeclarationId(1065), + ty: DeclarationId(1067), }, Field { label: "requires".to_string(), - ty: DeclarationId(2240), + ty: DeclarationId(2242), }, ], }, @@ -28943,7 +28995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13742, 13875), }); declarations.push(Declaration { - id: DeclarationId(1069), + id: DeclarationId(1071), name: Some("TestSuite".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28953,7 +29005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "claims".to_string(), - ty: DeclarationId(2241), + ty: DeclarationId(2243), }, ], }, @@ -28968,7 +29020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13877, 13936), }); declarations.push(Declaration { - id: DeclarationId(1070), + id: DeclarationId(1072), name: Some("TestObligation".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28978,7 +29030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "resources".to_string(), - ty: DeclarationId(2242), + ty: DeclarationId(2244), }, ], }, @@ -28993,11 +29045,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14134, 14215), }); declarations.push(Declaration { - id: DeclarationId(1071), + id: DeclarationId(1073), name: Some("claim_obligation_resources".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1068)], - output: DeclarationId(2198), + inputs: vec![DeclarationId(1070)], + output: DeclarationId(2200), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14657, @@ -29015,11 +29067,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14586, 14673), }); declarations.push(Declaration { - id: DeclarationId(1072), + id: DeclarationId(1074), name: Some("obligation_for_claim".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1068)], - output: DeclarationId(1070), + inputs: vec![DeclarationId(1070)], + output: DeclarationId(1072), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14731, @@ -29037,11 +29089,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14675, 14816), }); declarations.push(Declaration { - id: DeclarationId(1073), + id: DeclarationId(1075), name: Some("materialize_test_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2199)], - output: DeclarationId(2200), + inputs: vec![DeclarationId(2201)], + output: DeclarationId(2202), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14899, @@ -29059,11 +29111,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14818, 14938), }); declarations.push(Declaration { - id: DeclarationId(1074), + id: DeclarationId(1076), name: Some("behavior_spine".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], - output: DeclarationId(2243), + output: DeclarationId(2245), body: ArrowBody::UserDefined(NodeId(240)), }, type_params: vec![], @@ -29077,7 +29129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018), }); declarations.push(Declaration { - id: DeclarationId(1075), + id: DeclarationId(1077), name: Some("ValueBehavior".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29091,7 +29143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956), }); declarations.push(Declaration { - id: DeclarationId(1076), + id: DeclarationId(1078), name: Some("Transform".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29105,7 +29157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974), }); declarations.push(Declaration { - id: DeclarationId(1077), + id: DeclarationId(1079), name: Some("Branch".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29119,7 +29171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989), }); declarations.push(Declaration { - id: DeclarationId(1078), + id: DeclarationId(1080), name: Some("Loop".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29133,7 +29185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002), }); declarations.push(Declaration { - id: DeclarationId(1079), + id: DeclarationId(1081), name: Some("Bind".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29147,7 +29199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015), }); declarations.push(Declaration { - id: DeclarationId(1080), + id: DeclarationId(1082), name: Some("Main".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29161,7 +29213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028), }); declarations.push(Declaration { - id: DeclarationId(1081), + id: DeclarationId(1083), name: Some("DeclarationRef".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29175,7 +29227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783), }); declarations.push(Declaration { - id: DeclarationId(1082), + id: DeclarationId(1084), name: Some("go_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(853), @@ -29191,14 +29243,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(1859), + constructor: DeclarationId(1861), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1864), payload: vec![], }, ), @@ -29209,7 +29261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1630, 1732), }); declarations.push(Declaration { - id: DeclarationId(1083), + id: DeclarationId(1085), name: Some("go_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(855), @@ -29239,7 +29291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1734, 1884), }); declarations.push(Declaration { - id: DeclarationId(1084), + id: DeclarationId(1086), name: Some("go_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -29260,7 +29312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1886, 1961), }); declarations.push(Declaration { - id: DeclarationId(1085), + id: DeclarationId(1087), name: Some("go_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29275,7 +29327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29298,7 +29350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1963, 2093), }); declarations.push(Declaration { - id: DeclarationId(1086), + id: DeclarationId(1088), name: Some("go_int32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29313,7 +29365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29336,7 +29388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2095, 2229), }); declarations.push(Declaration { - id: DeclarationId(1087), + id: DeclarationId(1089), name: Some("go_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -29351,7 +29403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "kernel_integer".to_string(), @@ -29364,15 +29416,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -29384,7 +29436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1086)), + FieldValue::Reference(DeclarationId(1088)), ), ], }), @@ -29393,7 +29445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2231, 2534), }); declarations.push(Declaration { - id: DeclarationId(1088), + id: DeclarationId(1090), name: Some("go_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29408,7 +29460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29431,7 +29483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2536, 2667), }); declarations.push(Declaration { - id: DeclarationId(1089), + id: DeclarationId(1091), name: Some("go_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29446,7 +29498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29469,7 +29521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2669, 2806), }); declarations.push(Declaration { - id: DeclarationId(1090), + id: DeclarationId(1092), name: Some("go_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29484,7 +29536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29507,7 +29559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2808, 2946), }); declarations.push(Declaration { - id: DeclarationId(1091), + id: DeclarationId(1093), name: Some("go_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29522,7 +29574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29545,7 +29597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2948, 3086), }); declarations.push(Declaration { - id: DeclarationId(1092), + id: DeclarationId(1094), name: Some("go_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29560,7 +29612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29583,7 +29635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3088, 3247), }); declarations.push(Declaration { - id: DeclarationId(1093), + id: DeclarationId(1095), name: Some("go_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29598,7 +29650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29621,7 +29673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3249, 3396), }); declarations.push(Declaration { - id: DeclarationId(1094), + id: DeclarationId(1096), name: Some("go_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29636,7 +29688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29660,7 +29712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -29680,7 +29732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3398, 3639), }); declarations.push(Declaration { - id: DeclarationId(1095), + id: DeclarationId(1097), name: Some("go_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29695,7 +29747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29718,7 +29770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3641, 3789), }); declarations.push(Declaration { - id: DeclarationId(1096), + id: DeclarationId(1098), name: Some("go_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29733,7 +29785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29758,7 +29810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -29777,7 +29829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -29798,7 +29850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -29819,7 +29871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3791, 4174), }); declarations.push(Declaration { - id: DeclarationId(1097), + id: DeclarationId(1099), name: Some("go_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29834,7 +29886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29859,7 +29911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -29878,7 +29930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -29897,7 +29949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -29918,7 +29970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4176, 4570), }); declarations.push(Declaration { - id: DeclarationId(1098), + id: DeclarationId(1100), name: Some("go_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29933,7 +29985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29956,7 +30008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4572, 4726), }); declarations.push(Declaration { - id: DeclarationId(1099), + id: DeclarationId(1101), name: Some("go_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29971,7 +30023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29994,7 +30046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4728, 4882), }); declarations.push(Declaration { - id: DeclarationId(1100), + id: DeclarationId(1102), name: Some("go_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30009,7 +30061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30032,7 +30084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4884, 5053), }); declarations.push(Declaration { - id: DeclarationId(1101), + id: DeclarationId(1103), name: Some("go_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30047,7 +30099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30070,7 +30122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5055, 5199), }); declarations.push(Declaration { - id: DeclarationId(1102), + id: DeclarationId(1104), name: Some("go_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30085,7 +30137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30110,7 +30162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5201, 5386), }); declarations.push(Declaration { - id: DeclarationId(1103), + id: DeclarationId(1105), name: Some("go_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30125,7 +30177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30148,7 +30200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5388, 5548), }); declarations.push(Declaration { - id: DeclarationId(1104), + id: DeclarationId(1106), name: Some("go_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30163,7 +30215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30188,7 +30240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -30207,7 +30259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -30228,7 +30280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5550, 5852), }); declarations.push(Declaration { - id: DeclarationId(1105), + id: DeclarationId(1107), name: Some("go_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30243,7 +30295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30270,7 +30322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -30289,7 +30341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -30310,7 +30362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5854, 6191), }); declarations.push(Declaration { - id: DeclarationId(1106), + id: DeclarationId(1108), name: Some("go_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30325,7 +30377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30352,7 +30404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -30371,7 +30423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -30392,7 +30444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6193, 6534), }); declarations.push(Declaration { - id: DeclarationId(1107), + id: DeclarationId(1109), name: Some("go_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30407,7 +30459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30433,7 +30485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -30453,7 +30505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6536, 6808), }); declarations.push(Declaration { - id: DeclarationId(1108), + id: DeclarationId(1110), name: Some("go_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30468,7 +30520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30493,7 +30545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -30512,7 +30564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -30533,7 +30585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6810, 7121), }); declarations.push(Declaration { - id: DeclarationId(1109), + id: DeclarationId(1111), name: Some("go_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30548,7 +30600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30573,7 +30625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -30592,7 +30644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -30613,7 +30665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7123, 7439), }); declarations.push(Declaration { - id: DeclarationId(1110), + id: DeclarationId(1112), name: Some("go_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30628,7 +30680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30653,7 +30705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -30672,7 +30724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -30691,7 +30743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -30712,7 +30764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7441, 7850), }); declarations.push(Declaration { - id: DeclarationId(1111), + id: DeclarationId(1113), name: Some("go_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30727,7 +30779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30752,7 +30804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -30771,7 +30823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -30792,7 +30844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7852, 8168), }); declarations.push(Declaration { - id: DeclarationId(1112), + id: DeclarationId(1114), name: Some("go_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30807,7 +30859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30831,7 +30883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -30851,7 +30903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8170, 8411), }); declarations.push(Declaration { - id: DeclarationId(1113), + id: DeclarationId(1115), name: Some("go_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30866,7 +30918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30890,7 +30942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -30910,7 +30962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8413, 8654), }); declarations.push(Declaration { - id: DeclarationId(1114), + id: DeclarationId(1116), name: Some("go_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30925,7 +30977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30949,7 +31001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -30969,7 +31021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8656, 8915), }); declarations.push(Declaration { - id: DeclarationId(1115), + id: DeclarationId(1117), name: Some("go_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30984,7 +31036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31009,7 +31061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -31030,7 +31082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -31051,7 +31103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8917, 9250), }); declarations.push(Declaration { - id: DeclarationId(1116), + id: DeclarationId(1118), name: Some("go_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31066,7 +31118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31089,7 +31141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9252, 9403), }); declarations.push(Declaration { - id: DeclarationId(1117), + id: DeclarationId(1119), name: Some("go_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31104,7 +31156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31127,7 +31179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9405, 9553), }); declarations.push(Declaration { - id: DeclarationId(1118), + id: DeclarationId(1120), name: Some("go_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31142,7 +31194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31165,7 +31217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9555, 9703), }); declarations.push(Declaration { - id: DeclarationId(1119), + id: DeclarationId(1121), name: Some("go_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31180,7 +31232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31203,7 +31255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9705, 9868), }); declarations.push(Declaration { - id: DeclarationId(1120), + id: DeclarationId(1122), name: Some("go_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31218,7 +31270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31243,7 +31295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -31262,7 +31314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -31283,7 +31335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -31304,7 +31356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -31325,7 +31377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -31346,7 +31398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -31367,7 +31419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -31388,7 +31440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -31409,7 +31461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -31428,7 +31480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -31449,7 +31501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9870, 10887), }); declarations.push(Declaration { - id: DeclarationId(1121), + id: DeclarationId(1123), name: Some("go_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31464,7 +31516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31487,7 +31539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10889, 11046), }); declarations.push(Declaration { - id: DeclarationId(1122), + id: DeclarationId(1124), name: Some("go_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31502,7 +31554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31525,7 +31577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11048, 11205), }); declarations.push(Declaration { - id: DeclarationId(1123), + id: DeclarationId(1125), name: Some("go_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31540,7 +31592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31563,7 +31615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11207, 11355), }); declarations.push(Declaration { - id: DeclarationId(1124), + id: DeclarationId(1126), name: Some("go_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31578,7 +31630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31601,7 +31653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11357, 11514), }); declarations.push(Declaration { - id: DeclarationId(1125), + id: DeclarationId(1127), name: Some("go_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31616,7 +31668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31639,7 +31691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11516, 11682), }); declarations.push(Declaration { - id: DeclarationId(1126), + id: DeclarationId(1128), name: Some("go_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31654,7 +31706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31677,7 +31729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11684, 11844), }); declarations.push(Declaration { - id: DeclarationId(1127), + id: DeclarationId(1129), name: Some("go_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31692,7 +31744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31719,7 +31771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -31740,7 +31792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -31761,7 +31813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11846, 12197), }); declarations.push(Declaration { - id: DeclarationId(1128), + id: DeclarationId(1130), name: Some("go_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31776,7 +31828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31801,7 +31853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -31822,7 +31874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -31841,7 +31893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -31860,7 +31912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -31881,7 +31933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12199, 12686), }); declarations.push(Declaration { - id: DeclarationId(1129), + id: DeclarationId(1131), name: Some("go_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31896,7 +31948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31919,7 +31971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12688, 12836), }); declarations.push(Declaration { - id: DeclarationId(1130), + id: DeclarationId(1132), name: Some("go_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31934,7 +31986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31959,7 +32011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -31978,7 +32030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -31999,7 +32051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32018,7 +32070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32039,7 +32091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13310, 13784), }); declarations.push(Declaration { - id: DeclarationId(1131), + id: DeclarationId(1133), name: Some("go_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32054,7 +32106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32079,7 +32131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32098,7 +32150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -32117,7 +32169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -32138,7 +32190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32157,7 +32209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32178,7 +32230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13786, 14351), }); declarations.push(Declaration { - id: DeclarationId(1132), + id: DeclarationId(1134), name: Some("go_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32193,7 +32245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32218,7 +32270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32237,7 +32289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -32256,7 +32308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -32277,7 +32329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32296,7 +32348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32317,7 +32369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -32338,7 +32390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 14353, 15010), }); declarations.push(Declaration { - id: DeclarationId(1133), + id: DeclarationId(1135), name: Some("go_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32353,7 +32405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32378,7 +32430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32397,7 +32449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -32416,7 +32468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -32435,7 +32487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -32454,7 +32506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -32475,7 +32527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32494,7 +32546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32515,7 +32567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15012, 15714), }); declarations.push(Declaration { - id: DeclarationId(1134), + id: DeclarationId(1136), name: Some("go_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32530,7 +32582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32555,7 +32607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32574,7 +32626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -32595,7 +32647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32614,7 +32666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -32633,7 +32685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32654,7 +32706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -32675,7 +32727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15716, 16367), }); declarations.push(Declaration { - id: DeclarationId(1135), + id: DeclarationId(1137), name: Some("go_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32690,7 +32742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32713,7 +32765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16369, 16513), }); declarations.push(Declaration { - id: DeclarationId(1136), + id: DeclarationId(1138), name: Some("go_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32728,7 +32780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32755,7 +32807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -32774,7 +32826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -32793,7 +32845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -32814,7 +32866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -32835,7 +32887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16515, 16982), }); declarations.push(Declaration { - id: DeclarationId(1137), + id: DeclarationId(1139), name: Some("go_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32850,7 +32902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32874,7 +32926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -32894,7 +32946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17285, 17526), }); declarations.push(Declaration { - id: DeclarationId(1138), + id: DeclarationId(1140), name: Some("go_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32909,7 +32961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32932,7 +32984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17528, 17682), }); declarations.push(Declaration { - id: DeclarationId(1139), + id: DeclarationId(1141), name: Some("go_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32947,7 +32999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32972,7 +33024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -32991,7 +33043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -33012,7 +33064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -33033,7 +33085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17684, 18082), }); declarations.push(Declaration { - id: DeclarationId(1140), + id: DeclarationId(1142), name: Some("go_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33048,7 +33100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33073,7 +33125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33092,7 +33144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -33113,7 +33165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18084, 18393), }); declarations.push(Declaration { - id: DeclarationId(1141), + id: DeclarationId(1143), name: Some("go_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33128,7 +33180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33153,7 +33205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33172,7 +33224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -33191,7 +33243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33212,7 +33264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18395, 18797), }); declarations.push(Declaration { - id: DeclarationId(1142), + id: DeclarationId(1144), name: Some("go_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33227,7 +33279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33250,7 +33302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18799, 18962), }); declarations.push(Declaration { - id: DeclarationId(1143), + id: DeclarationId(1145), name: Some("go_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33265,7 +33317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33288,7 +33340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18964, 19118), }); declarations.push(Declaration { - id: DeclarationId(1144), + id: DeclarationId(1146), name: Some("go_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33303,7 +33355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33328,7 +33380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33347,7 +33399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -33366,7 +33418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33387,7 +33439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19120, 19531), }); declarations.push(Declaration { - id: DeclarationId(1145), + id: DeclarationId(1147), name: Some("go_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33402,7 +33454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33427,7 +33479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -33448,7 +33500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -33467,7 +33519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -33486,7 +33538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33507,7 +33559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19533, 20018), }); declarations.push(Declaration { - id: DeclarationId(1146), + id: DeclarationId(1148), name: Some("go_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33522,7 +33574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33547,7 +33599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -33566,7 +33618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -33585,7 +33637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33606,7 +33658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20020, 20426), }); declarations.push(Declaration { - id: DeclarationId(1147), + id: DeclarationId(1149), name: Some("go_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33621,7 +33673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33646,7 +33698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33665,7 +33717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -33684,7 +33736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33705,7 +33757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20428, 20846), }); declarations.push(Declaration { - id: DeclarationId(1148), + id: DeclarationId(1150), name: Some("go_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33720,7 +33772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33743,7 +33795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20848, 21011), }); declarations.push(Declaration { - id: DeclarationId(1149), + id: DeclarationId(1151), name: Some("go_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33758,7 +33810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33781,7 +33833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21013, 21176), }); declarations.push(Declaration { - id: DeclarationId(1150), + id: DeclarationId(1152), name: Some("go_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33796,7 +33848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33819,7 +33871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21178, 21332), }); declarations.push(Declaration { - id: DeclarationId(1151), + id: DeclarationId(1153), name: Some("go_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33834,7 +33886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33853,7 +33905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21334, 21475), }); declarations.push(Declaration { - id: DeclarationId(1152), + id: DeclarationId(1154), name: Some("go_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33868,7 +33920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33887,7 +33939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21477, 21618), }); declarations.push(Declaration { - id: DeclarationId(1153), + id: DeclarationId(1155), name: Some("go_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33902,7 +33954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33921,7 +33973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21620, 21761), }); declarations.push(Declaration { - id: DeclarationId(1154), + id: DeclarationId(1156), name: Some("go_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33936,7 +33988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33957,7 +34009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21763, 21911), }); declarations.push(Declaration { - id: DeclarationId(1155), + id: DeclarationId(1157), name: Some("go_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33972,7 +34024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33991,7 +34043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21913, 22053), }); declarations.push(Declaration { - id: DeclarationId(1156), + id: DeclarationId(1158), name: Some("go_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34006,7 +34058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34025,7 +34077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22055, 22202), }); declarations.push(Declaration { - id: DeclarationId(1157), + id: DeclarationId(1159), name: Some("go_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34040,7 +34092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34059,7 +34111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22204, 22351), }); declarations.push(Declaration { - id: DeclarationId(1158), + id: DeclarationId(1160), name: Some("go_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34074,7 +34126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34093,7 +34145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22353, 22514), }); declarations.push(Declaration { - id: DeclarationId(1159), + id: DeclarationId(1161), name: Some("go_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34108,7 +34160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34127,7 +34179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22516, 22656), }); declarations.push(Declaration { - id: DeclarationId(1160), + id: DeclarationId(1162), name: Some("go_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34142,7 +34194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34161,7 +34213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22658, 22805), }); declarations.push(Declaration { - id: DeclarationId(1161), + id: DeclarationId(1163), name: Some("go_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34176,7 +34228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34195,7 +34247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22807, 22954), }); declarations.push(Declaration { - id: DeclarationId(1162), + id: DeclarationId(1164), name: Some("go_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34210,7 +34262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34229,7 +34281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22956, 23117), }); declarations.push(Declaration { - id: DeclarationId(1163), + id: DeclarationId(1165), name: Some("go_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34244,7 +34296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34263,7 +34315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23258), }); declarations.push(Declaration { - id: DeclarationId(1164), + id: DeclarationId(1166), name: Some("go_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34278,7 +34330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34297,7 +34349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23260, 23400), }); declarations.push(Declaration { - id: DeclarationId(1165), + id: DeclarationId(1167), name: Some("go_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34312,7 +34364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34331,7 +34383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23402, 23541), }); declarations.push(Declaration { - id: DeclarationId(1166), + id: DeclarationId(1168), name: Some("go_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34346,7 +34398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34365,7 +34417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23543, 23683), }); declarations.push(Declaration { - id: DeclarationId(1167), + id: DeclarationId(1169), name: Some("go_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34380,7 +34432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34399,7 +34451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23685, 23834), }); declarations.push(Declaration { - id: DeclarationId(1168), + id: DeclarationId(1170), name: Some("go_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34414,7 +34466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34433,7 +34485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23836, 23985), }); declarations.push(Declaration { - id: DeclarationId(1169), + id: DeclarationId(1171), name: Some("go_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -34448,11 +34500,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1079)), + FieldValue::Reference(DeclarationId(1081)), ), ( "carrier".to_string(), @@ -34468,7 +34520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23987, 24120), }); declarations.push(Declaration { - id: DeclarationId(1170), + id: DeclarationId(1172), name: Some("go_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -34483,11 +34535,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1077)), + FieldValue::Reference(DeclarationId(1079)), ), ( "carrier".to_string(), @@ -34503,7 +34555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24122, 24265), }); declarations.push(Declaration { - id: DeclarationId(1171), + id: DeclarationId(1173), name: Some("go_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -34518,11 +34570,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1080)), + FieldValue::Reference(DeclarationId(1082)), ), ( "carrier".to_string(), @@ -34538,7 +34590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24267, 24420), }); declarations.push(Declaration { - id: DeclarationId(1172), + id: DeclarationId(1174), name: Some("go_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34553,7 +34605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34562,7 +34614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -34575,7 +34627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24422, 24560), }); declarations.push(Declaration { - id: DeclarationId(1173), + id: DeclarationId(1175), name: Some("go_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34590,7 +34642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34599,7 +34651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -34610,7 +34662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34624,7 +34676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24562, 24754), }); declarations.push(Declaration { - id: DeclarationId(1174), + id: DeclarationId(1176), name: Some("go_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34639,7 +34691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34648,7 +34700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -34660,7 +34712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34670,7 +34722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34685,7 +34737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24756, 24973), }); declarations.push(Declaration { - id: DeclarationId(1175), + id: DeclarationId(1177), name: Some("go_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34700,7 +34752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34709,7 +34761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1935), + constructor: DeclarationId(1937), payload: vec![], }, ), @@ -34721,7 +34773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34731,7 +34783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34746,7 +34798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24975, 25198), }); declarations.push(Declaration { - id: DeclarationId(1176), + id: DeclarationId(1178), name: Some("go_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34761,7 +34813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34770,7 +34822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1936), + constructor: DeclarationId(1938), payload: vec![], }, ), @@ -34781,7 +34833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -34795,7 +34847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25200, 25383), }); declarations.push(Declaration { - id: DeclarationId(1177), + id: DeclarationId(1179), name: Some("go_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -34810,7 +34862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34828,7 +34880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25385, 25521), }); declarations.push(Declaration { - id: DeclarationId(1178), + id: DeclarationId(1180), name: Some("go_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -34843,7 +34895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34863,7 +34915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26207, 26360), }); declarations.push(Declaration { - id: DeclarationId(1179), + id: DeclarationId(1181), name: Some("go_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -34878,7 +34930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34896,7 +34948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26362, 26502), }); declarations.push(Declaration { - id: DeclarationId(1180), + id: DeclarationId(1182), name: Some("go_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34911,7 +34963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34920,7 +34972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1937), + constructor: DeclarationId(1939), payload: vec![], }, ), @@ -34931,7 +34983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -34945,7 +34997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26504, 26692), }); declarations.push(Declaration { - id: DeclarationId(1181), + id: DeclarationId(1183), name: Some("go_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34960,7 +35012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34969,7 +35021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1938), + constructor: DeclarationId(1940), payload: vec![], }, ), @@ -34981,7 +35033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -34991,7 +35043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -35001,7 +35053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35016,7 +35068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26694, 26951), }); declarations.push(Declaration { - id: DeclarationId(1182), + id: DeclarationId(1184), name: Some("go_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -35031,7 +35083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35040,7 +35092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1939), + constructor: DeclarationId(1941), payload: vec![], }, ), @@ -35052,7 +35104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35062,7 +35114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35077,7 +35129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26953, 27167), }); declarations.push(Declaration { - id: DeclarationId(1183), + id: DeclarationId(1185), name: Some("go_filter_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -35092,7 +35144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35101,7 +35153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1940), + constructor: DeclarationId(1942), payload: vec![], }, ), @@ -35113,7 +35165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35123,7 +35175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35138,7 +35190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27169, 27392), }); declarations.push(Declaration { - id: DeclarationId(1184), + id: DeclarationId(1186), name: Some("go_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -35153,7 +35205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35162,7 +35214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1941), + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -35174,7 +35226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35184,7 +35236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35199,7 +35251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27394, 27623), }); declarations.push(Declaration { - id: DeclarationId(1185), + id: DeclarationId(1187), name: Some("go_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(910), @@ -35214,7 +35266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35223,17 +35275,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1501)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1503)), ), ( "scrutinee".to_string(), @@ -35263,7 +35315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27710, 28016), }); declarations.push(Declaration { - id: DeclarationId(1186), + id: DeclarationId(1188), name: Some("go_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -35293,7 +35345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28018, 28148), }); declarations.push(Declaration { - id: DeclarationId(1187), + id: DeclarationId(1189), name: Some("go_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(913), @@ -35327,7 +35379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28150, 28310), }); declarations.push(Declaration { - id: DeclarationId(1188), + id: DeclarationId(1190), name: Some("go_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(915), @@ -35372,7 +35424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28312, 28513), }); declarations.push(Declaration { - id: DeclarationId(1189), + id: DeclarationId(1191), name: Some("go_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -35404,7 +35456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28515, 28625), }); declarations.push(Declaration { - id: DeclarationId(1190), + id: DeclarationId(1192), name: Some("go_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -35426,7 +35478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28627, 28684), }); declarations.push(Declaration { - id: DeclarationId(1191), + id: DeclarationId(1193), name: Some("go_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(918), @@ -35472,7 +35524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28686, 28971), }); declarations.push(Declaration { - id: DeclarationId(1192), + id: DeclarationId(1194), name: Some("go_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -35494,7 +35546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28973, 29052), }); declarations.push(Declaration { - id: DeclarationId(1193), + id: DeclarationId(1195), name: Some("go_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -35538,7 +35590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29054, 29277), }); declarations.push(Declaration { - id: DeclarationId(1194), + id: DeclarationId(1196), name: Some("go_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -35592,7 +35644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29279, 29571), }); declarations.push(Declaration { - id: DeclarationId(1195), + id: DeclarationId(1197), name: Some("go_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -35666,7 +35718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29573, 30008), }); declarations.push(Declaration { - id: DeclarationId(1196), + id: DeclarationId(1198), name: Some("go_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -35710,7 +35762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30010, 30278), }); declarations.push(Declaration { - id: DeclarationId(1197), + id: DeclarationId(1199), name: Some("go_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -35738,7 +35790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31035, 31150), }); declarations.push(Declaration { - id: DeclarationId(1198), + id: DeclarationId(1200), name: Some("go_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -35753,51 +35805,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1186)), + FieldValue::Reference(DeclarationId(1188)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1187)), + FieldValue::Reference(DeclarationId(1189)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1188)), + FieldValue::Reference(DeclarationId(1190)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1189)), + FieldValue::Reference(DeclarationId(1191)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1190)), + FieldValue::Reference(DeclarationId(1192)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1191)), + FieldValue::Reference(DeclarationId(1193)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1192)), + FieldValue::Reference(DeclarationId(1194)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1193)), + FieldValue::Reference(DeclarationId(1195)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1197)), + FieldValue::Reference(DeclarationId(1199)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1194)), + FieldValue::Reference(DeclarationId(1196)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1195)), + FieldValue::Reference(DeclarationId(1197)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1196)), + FieldValue::Reference(DeclarationId(1198)), ), ], }), @@ -35806,7 +35858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31152, 31571), }); declarations.push(Declaration { - id: DeclarationId(1199), + id: DeclarationId(1201), name: Some("go_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(827), @@ -35842,7 +35894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33238, 33374), }); declarations.push(Declaration { - id: DeclarationId(1200), + id: DeclarationId(1202), name: Some("go_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(818), @@ -35858,55 +35910,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(1795), + constructor: DeclarationId(1797), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1798), + constructor: DeclarationId(1800), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1801), + constructor: DeclarationId(1803), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(1804), + constructor: DeclarationId(1806), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(1808), + constructor: DeclarationId(1810), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1810), + constructor: DeclarationId(1812), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(1814), + constructor: DeclarationId(1816), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1199)), + FieldValue::Reference(DeclarationId(1201)), ), ( "post_emit_verifier".to_string(), @@ -35932,7 +35984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1817), + constructor: DeclarationId(1819), payload: vec![], }, ), @@ -35945,7 +35997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33376, 33934), }); declarations.push(Declaration { - id: DeclarationId(1201), + id: DeclarationId(1203), name: Some("go_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(819), @@ -35960,11 +36012,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1200)), + FieldValue::Reference(DeclarationId(1202)), ), ], }), @@ -35973,7 +36025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33936, 34060), }); declarations.push(Declaration { - id: DeclarationId(1202), + id: DeclarationId(1204), name: Some("python_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -36001,7 +36053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 1887, 2009), }); declarations.push(Declaration { - id: DeclarationId(1203), + id: DeclarationId(1205), name: Some("python_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(913), @@ -36035,7 +36087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2011, 2164), }); declarations.push(Declaration { - id: DeclarationId(1204), + id: DeclarationId(1206), name: Some("python_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(915), @@ -36080,7 +36132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2166, 2381), }); declarations.push(Declaration { - id: DeclarationId(1205), + id: DeclarationId(1207), name: Some("python_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -36112,7 +36164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2383, 2497), }); declarations.push(Declaration { - id: DeclarationId(1206), + id: DeclarationId(1208), name: Some("python_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -36134,7 +36186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2499, 2560), }); declarations.push(Declaration { - id: DeclarationId(1207), + id: DeclarationId(1209), name: Some("python_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(918), @@ -36180,7 +36232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2562, 2869), }); declarations.push(Declaration { - id: DeclarationId(1208), + id: DeclarationId(1210), name: Some("python_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -36204,7 +36256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2871, 2970), }); declarations.push(Declaration { - id: DeclarationId(1209), + id: DeclarationId(1211), name: Some("python_type_definitions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -36252,7 +36304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2972, 3303), }); declarations.push(Declaration { - id: DeclarationId(1210), + id: DeclarationId(1212), name: Some("python_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -36306,7 +36358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3305, 3635), }); declarations.push(Declaration { - id: DeclarationId(1211), + id: DeclarationId(1213), name: Some("python_collections".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -36372,7 +36424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3637, 4026), }); declarations.push(Declaration { - id: DeclarationId(1212), + id: DeclarationId(1214), name: Some("python_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -36412,7 +36464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4028, 4280), }); declarations.push(Declaration { - id: DeclarationId(1213), + id: DeclarationId(1215), name: Some("python_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -36440,7 +36492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4483, 4602), }); declarations.push(Declaration { - id: DeclarationId(1214), + id: DeclarationId(1216), name: Some("python_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -36455,51 +36507,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1203)), + FieldValue::Reference(DeclarationId(1205)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1204)), + FieldValue::Reference(DeclarationId(1206)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1205)), + FieldValue::Reference(DeclarationId(1207)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1206)), + FieldValue::Reference(DeclarationId(1208)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1207)), + FieldValue::Reference(DeclarationId(1209)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1208)), + FieldValue::Reference(DeclarationId(1210)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1209)), + FieldValue::Reference(DeclarationId(1211)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1213)), + FieldValue::Reference(DeclarationId(1215)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1210)), + FieldValue::Reference(DeclarationId(1212)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1211)), + FieldValue::Reference(DeclarationId(1213)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1212)), + FieldValue::Reference(DeclarationId(1214)), ), ], }), @@ -36508,7 +36560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4604, 5079), }); declarations.push(Declaration { - id: DeclarationId(1215), + id: DeclarationId(1217), name: Some("python_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(853), @@ -36524,14 +36576,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(1859), + constructor: DeclarationId(1861), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1864), payload: vec![], }, ), @@ -36542,7 +36594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5081, 5178), }); declarations.push(Declaration { - id: DeclarationId(1216), + id: DeclarationId(1218), name: Some("python_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(855), @@ -36570,7 +36622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5180, 5316), }); declarations.push(Declaration { - id: DeclarationId(1217), + id: DeclarationId(1219), name: Some("python_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -36591,7 +36643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5397), }); declarations.push(Declaration { - id: DeclarationId(1218), + id: DeclarationId(1220), name: Some("python_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36606,7 +36658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36629,7 +36681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5399, 5535), }); declarations.push(Declaration { - id: DeclarationId(1219), + id: DeclarationId(1221), name: Some("python_integer_inhabit_at_i32_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -36644,7 +36696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "kernel_integer".to_string(), @@ -36657,15 +36709,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -36677,7 +36729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ], }), @@ -36686,7 +36738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5628, 5937), }); declarations.push(Declaration { - id: DeclarationId(1220), + id: DeclarationId(1222), name: Some("python_integer_inhabit_unbounded_decl".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -36701,7 +36753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "kernel_integer".to_string(), @@ -36714,16 +36766,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1594), + constructor: DeclarationId(1596), payload: vec![], }], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ], }), @@ -36732,7 +36784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6225), }); declarations.push(Declaration { - id: DeclarationId(1221), + id: DeclarationId(1223), name: Some("python_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36747,7 +36799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36770,7 +36822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6227, 6366), }); declarations.push(Declaration { - id: DeclarationId(1222), + id: DeclarationId(1224), name: Some("python_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36785,7 +36837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36808,7 +36860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6368, 6510), }); declarations.push(Declaration { - id: DeclarationId(1223), + id: DeclarationId(1225), name: Some("python_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36823,7 +36875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36846,7 +36898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6512, 6658), }); declarations.push(Declaration { - id: DeclarationId(1224), + id: DeclarationId(1226), name: Some("python_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36861,7 +36913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36884,7 +36936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6660, 6806), }); declarations.push(Declaration { - id: DeclarationId(1225), + id: DeclarationId(1227), name: Some("python_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36899,7 +36951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36922,7 +36974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6808, 6975), }); declarations.push(Declaration { - id: DeclarationId(1226), + id: DeclarationId(1228), name: Some("python_declaration_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36937,11 +36989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1081)), + FieldValue::Reference(DeclarationId(1083)), ), ( "carrier".to_string(), @@ -36960,7 +37012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6977, 7146), }); declarations.push(Declaration { - id: DeclarationId(1227), + id: DeclarationId(1229), name: Some("python_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36975,7 +37027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36998,7 +37050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7148, 7307), }); declarations.push(Declaration { - id: DeclarationId(1228), + id: DeclarationId(1230), name: Some("python_dag_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37013,7 +37065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37036,7 +37088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7309, 7459), }); declarations.push(Declaration { - id: DeclarationId(1229), + id: DeclarationId(1231), name: Some("python_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37051,7 +37103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37074,7 +37126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7461, 7620), }); declarations.push(Declaration { - id: DeclarationId(1230), + id: DeclarationId(1232), name: Some("python_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37089,7 +37141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37112,7 +37164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7622, 7778), }); declarations.push(Declaration { - id: DeclarationId(1231), + id: DeclarationId(1233), name: Some("python_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37127,7 +37179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37150,7 +37202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7780, 7948), }); declarations.push(Declaration { - id: DeclarationId(1232), + id: DeclarationId(1234), name: Some("python_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37165,7 +37217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37188,7 +37240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7950, 8109), }); declarations.push(Declaration { - id: DeclarationId(1233), + id: DeclarationId(1235), name: Some("python_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37203,7 +37255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37226,7 +37278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8111, 8264), }); declarations.push(Declaration { - id: DeclarationId(1234), + id: DeclarationId(1236), name: Some("python_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37241,7 +37293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37264,7 +37316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8266, 8419), }); declarations.push(Declaration { - id: DeclarationId(1235), + id: DeclarationId(1237), name: Some("python_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37279,7 +37331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37302,7 +37354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8421, 8573), }); declarations.push(Declaration { - id: DeclarationId(1236), + id: DeclarationId(1238), name: Some("python_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37317,7 +37369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37340,7 +37392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8575, 8712), }); declarations.push(Declaration { - id: DeclarationId(1237), + id: DeclarationId(1239), name: Some("python_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37355,7 +37407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37379,7 +37431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -37399,7 +37451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8786, 9035), }); declarations.push(Declaration { - id: DeclarationId(1238), + id: DeclarationId(1240), name: Some("python_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37414,7 +37466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37437,7 +37489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9037, 9199), }); declarations.push(Declaration { - id: DeclarationId(1239), + id: DeclarationId(1241), name: Some("python_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37452,7 +37504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37477,7 +37529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37496,7 +37548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -37517,7 +37569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -37538,7 +37590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9201, 9607), }); declarations.push(Declaration { - id: DeclarationId(1240), + id: DeclarationId(1242), name: Some("python_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37553,7 +37605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37578,7 +37630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37597,7 +37649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -37618,7 +37670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9609, 9926), }); declarations.push(Declaration { - id: DeclarationId(1241), + id: DeclarationId(1243), name: Some("python_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37633,7 +37685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37658,7 +37710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37677,7 +37729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -37696,7 +37748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37717,7 +37769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9928, 10338), }); declarations.push(Declaration { - id: DeclarationId(1242), + id: DeclarationId(1244), name: Some("python_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37732,7 +37784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37755,7 +37807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10340, 10511), }); declarations.push(Declaration { - id: DeclarationId(1243), + id: DeclarationId(1245), name: Some("python_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37770,7 +37822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37793,7 +37845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10513, 10675), }); declarations.push(Declaration { - id: DeclarationId(1244), + id: DeclarationId(1246), name: Some("python_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37808,7 +37860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37833,7 +37885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37852,7 +37904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -37871,7 +37923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37892,7 +37944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10677, 11096), }); declarations.push(Declaration { - id: DeclarationId(1245), + id: DeclarationId(1247), name: Some("python_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37907,7 +37959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37932,7 +37984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -37953,7 +38005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -37972,7 +38024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -37991,7 +38043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38012,7 +38064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11098, 11591), }); declarations.push(Declaration { - id: DeclarationId(1246), + id: DeclarationId(1248), name: Some("python_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38027,7 +38079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38052,7 +38104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -38071,7 +38123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -38090,7 +38142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38111,7 +38163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11593, 12007), }); declarations.push(Declaration { - id: DeclarationId(1247), + id: DeclarationId(1249), name: Some("python_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38126,7 +38178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38151,7 +38203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -38170,7 +38222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -38189,7 +38241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38210,7 +38262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12009, 12435), }); declarations.push(Declaration { - id: DeclarationId(1248), + id: DeclarationId(1250), name: Some("python_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38225,7 +38277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38248,7 +38300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12437, 12608), }); declarations.push(Declaration { - id: DeclarationId(1249), + id: DeclarationId(1251), name: Some("python_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38263,7 +38315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38286,7 +38338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12610, 12781), }); declarations.push(Declaration { - id: DeclarationId(1250), + id: DeclarationId(1252), name: Some("python_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38301,7 +38353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38324,7 +38376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12783, 12945), }); declarations.push(Declaration { - id: DeclarationId(1251), + id: DeclarationId(1253), name: Some("python_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38339,7 +38391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38358,7 +38410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12947, 13096), }); declarations.push(Declaration { - id: DeclarationId(1252), + id: DeclarationId(1254), name: Some("python_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38373,7 +38425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38392,7 +38444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13098, 13247), }); declarations.push(Declaration { - id: DeclarationId(1253), + id: DeclarationId(1255), name: Some("python_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38407,7 +38459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38426,7 +38478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13249, 13398), }); declarations.push(Declaration { - id: DeclarationId(1254), + id: DeclarationId(1256), name: Some("python_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38441,7 +38493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38462,7 +38514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13400, 13559), }); declarations.push(Declaration { - id: DeclarationId(1255), + id: DeclarationId(1257), name: Some("python_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38477,7 +38529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38496,7 +38548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13561, 13709), }); declarations.push(Declaration { - id: DeclarationId(1256), + id: DeclarationId(1258), name: Some("python_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38511,7 +38563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38530,7 +38582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13711, 13866), }); declarations.push(Declaration { - id: DeclarationId(1257), + id: DeclarationId(1259), name: Some("python_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38545,7 +38597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38564,7 +38616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13868, 14023), }); declarations.push(Declaration { - id: DeclarationId(1258), + id: DeclarationId(1260), name: Some("python_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38579,7 +38631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38598,7 +38650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14025, 14194), }); declarations.push(Declaration { - id: DeclarationId(1259), + id: DeclarationId(1261), name: Some("python_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38613,7 +38665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38632,7 +38684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14196, 14344), }); declarations.push(Declaration { - id: DeclarationId(1260), + id: DeclarationId(1262), name: Some("python_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38647,7 +38699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38666,7 +38718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14346, 14493), }); declarations.push(Declaration { - id: DeclarationId(1261), + id: DeclarationId(1263), name: Some("python_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38681,7 +38733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38700,7 +38752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14495, 14643), }); declarations.push(Declaration { - id: DeclarationId(1262), + id: DeclarationId(1264), name: Some("python_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38715,7 +38767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38734,7 +38786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14645, 14792), }); declarations.push(Declaration { - id: DeclarationId(1263), + id: DeclarationId(1265), name: Some("python_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38749,7 +38801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38768,7 +38820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14794, 14942), }); declarations.push(Declaration { - id: DeclarationId(1264), + id: DeclarationId(1266), name: Some("python_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38783,7 +38835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38802,7 +38854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14944, 15102), }); declarations.push(Declaration { - id: DeclarationId(1265), + id: DeclarationId(1267), name: Some("python_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38817,7 +38869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38836,7 +38888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15104, 15261), }); declarations.push(Declaration { - id: DeclarationId(1266), + id: DeclarationId(1268), name: Some("python_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38851,7 +38903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38860,7 +38912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -38873,7 +38925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15263, 15409), }); declarations.push(Declaration { - id: DeclarationId(1267), + id: DeclarationId(1269), name: Some("python_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38888,7 +38940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38897,7 +38949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -38908,7 +38960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -38922,7 +38974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15411, 15611), }); declarations.push(Declaration { - id: DeclarationId(1268), + id: DeclarationId(1270), name: Some("python_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38937,7 +38989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38946,7 +38998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -38958,7 +39010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -38968,7 +39020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -38983,7 +39035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15613, 15838), }); declarations.push(Declaration { - id: DeclarationId(1269), + id: DeclarationId(1271), name: Some("python_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38998,7 +39050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39007,7 +39059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1935), + constructor: DeclarationId(1937), payload: vec![], }, ), @@ -39019,7 +39071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -39029,7 +39081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -39044,7 +39096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15840, 16071), }); declarations.push(Declaration { - id: DeclarationId(1270), + id: DeclarationId(1272), name: Some("python_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39059,7 +39111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39068,7 +39120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1936), + constructor: DeclarationId(1938), payload: vec![], }, ), @@ -39079,7 +39131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39093,7 +39145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16073, 16264), }); declarations.push(Declaration { - id: DeclarationId(1271), + id: DeclarationId(1273), name: Some("python_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39108,7 +39160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39117,7 +39169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1937), + constructor: DeclarationId(1939), payload: vec![], }, ), @@ -39128,7 +39180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39142,7 +39194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16266, 16462), }); declarations.push(Declaration { - id: DeclarationId(1272), + id: DeclarationId(1274), name: Some("python_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39157,7 +39209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39166,7 +39218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1938), + constructor: DeclarationId(1940), payload: vec![], }, ), @@ -39178,7 +39230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39188,7 +39240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -39198,7 +39250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39213,7 +39265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16464, 16729), }); declarations.push(Declaration { - id: DeclarationId(1273), + id: DeclarationId(1275), name: Some("python_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39228,7 +39280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39237,7 +39289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1939), + constructor: DeclarationId(1941), payload: vec![], }, ), @@ -39249,7 +39301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39259,7 +39311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39274,7 +39326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16731, 16953), }); declarations.push(Declaration { - id: DeclarationId(1274), + id: DeclarationId(1276), name: Some("python_filter_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39289,7 +39341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39298,7 +39350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1940), + constructor: DeclarationId(1942), payload: vec![], }, ), @@ -39310,7 +39362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39320,7 +39372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39335,7 +39387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16955, 17186), }); declarations.push(Declaration { - id: DeclarationId(1275), + id: DeclarationId(1277), name: Some("python_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39350,7 +39402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39359,7 +39411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1941), + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -39371,7 +39423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39381,7 +39433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39396,7 +39448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17188, 17425), }); declarations.push(Declaration { - id: DeclarationId(1276), + id: DeclarationId(1278), name: Some("python_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -39411,7 +39463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39428,9 +39480,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17427, 17575), }); - declarations.push(Declaration { id: DeclarationId(1277), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(908)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1214))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) }); + declarations.push(Declaration { id: DeclarationId(1279), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(908)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1216))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) }); declarations.push(Declaration { - id: DeclarationId(1278), + id: DeclarationId(1280), name: Some("python_non_empty_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -39445,7 +39497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39465,7 +39517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18020, 18194), }); declarations.push(Declaration { - id: DeclarationId(1279), + id: DeclarationId(1281), name: Some("python_non_singleton_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -39480,7 +39532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39500,7 +39552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18196, 18382), }); declarations.push(Declaration { - id: DeclarationId(1280), + id: DeclarationId(1282), name: Some("python_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(910), @@ -39515,7 +39567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39524,17 +39576,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1501)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1503)), ), ( "scrutinee".to_string(), @@ -39564,7 +39616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18383, 18697), }); declarations.push(Declaration { - id: DeclarationId(1281), + id: DeclarationId(1283), name: Some("python_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(827), @@ -39600,7 +39652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 20762, 20904), }); declarations.push(Declaration { - id: DeclarationId(1282), + id: DeclarationId(1284), name: Some("python_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(818), @@ -39616,55 +39668,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(1795), + constructor: DeclarationId(1797), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1800), + constructor: DeclarationId(1802), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1801), + constructor: DeclarationId(1803), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(1804), + constructor: DeclarationId(1806), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(1808), + constructor: DeclarationId(1810), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1809), + constructor: DeclarationId(1811), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(1814), + constructor: DeclarationId(1816), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1281)), + FieldValue::Reference(DeclarationId(1283)), ), ( "post_emit_verifier".to_string(), @@ -39693,7 +39745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1816), + constructor: DeclarationId(1818), payload: vec![], }, ), @@ -39706,7 +39758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 20906, 21486), }); declarations.push(Declaration { - id: DeclarationId(1283), + id: DeclarationId(1285), name: Some("python_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(819), @@ -39721,11 +39773,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1282)), + FieldValue::Reference(DeclarationId(1284)), ), ], }), @@ -39734,7 +39786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 21488, 21624), }); declarations.push(Declaration { - id: DeclarationId(1284), + id: DeclarationId(1286), name: Some("rust_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(853), @@ -39750,14 +39802,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(1861), + constructor: DeclarationId(1863), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1864), payload: vec![], }, ), @@ -39768,7 +39820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4448, 4550), }); declarations.push(Declaration { - id: DeclarationId(1285), + id: DeclarationId(1287), name: Some("rust_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(855), @@ -39798,7 +39850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4552, 4704), }); declarations.push(Declaration { - id: DeclarationId(1286), + id: DeclarationId(1288), name: Some("rust_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -39819,7 +39871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4706, 4781), }); declarations.push(Declaration { - id: DeclarationId(1287), + id: DeclarationId(1289), name: Some("rust_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39834,7 +39886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39857,7 +39909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5232, 5364), }); declarations.push(Declaration { - id: DeclarationId(1288), + id: DeclarationId(1290), name: Some("rust_uint8".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39872,7 +39924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39895,7 +39947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5366, 5501), }); declarations.push(Declaration { - id: DeclarationId(1289), + id: DeclarationId(1291), name: Some("rust_i32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39910,7 +39962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39933,7 +39985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5503, 5637), }); declarations.push(Declaration { - id: DeclarationId(1290), + id: DeclarationId(1292), name: Some("rust_u32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39948,7 +40000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39971,7 +40023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5639, 5774), }); declarations.push(Declaration { - id: DeclarationId(1291), + id: DeclarationId(1293), name: Some("rust_i128".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39986,7 +40038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40009,7 +40061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5776, 5913), }); declarations.push(Declaration { - id: DeclarationId(1292), + id: DeclarationId(1294), name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40024,7 +40076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40037,15 +40089,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(0)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -40057,7 +40109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1290)), + FieldValue::Reference(DeclarationId(1292)), ), ], }), @@ -40066,7 +40118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6334, 6633), }); declarations.push(Declaration { - id: DeclarationId(1293), + id: DeclarationId(1295), name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40081,7 +40133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40094,15 +40146,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -40114,7 +40166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1289)), + FieldValue::Reference(DeclarationId(1291)), ), ], }), @@ -40123,7 +40175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6635, 6942), }); declarations.push(Declaration { - id: DeclarationId(1294), + id: DeclarationId(1296), name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40138,7 +40190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40151,13 +40203,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1917), + constructor: DeclarationId(1919), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1289)), + FieldValue::Reference(DeclarationId(1291)), ), ], }), @@ -40166,7 +40218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6944, 7149), }); declarations.push(Declaration { - id: DeclarationId(1295), + id: DeclarationId(1297), name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40181,7 +40233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40194,13 +40246,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1917), + constructor: DeclarationId(1919), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1287)), + FieldValue::Reference(DeclarationId(1289)), ), ], }), @@ -40209,7 +40261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7151, 7354), }); declarations.push(Declaration { - id: DeclarationId(1296), + id: DeclarationId(1298), name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40224,7 +40276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40237,13 +40289,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1917), + constructor: DeclarationId(1919), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1291)), + FieldValue::Reference(DeclarationId(1293)), ), ], }), @@ -40252,7 +40304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7356, 7565), }); declarations.push(Declaration { - id: DeclarationId(1297), + id: DeclarationId(1299), name: Some("rust_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40267,7 +40319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40290,7 +40342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7567, 7702), }); declarations.push(Declaration { - id: DeclarationId(1298), + id: DeclarationId(1300), name: Some("rust_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40305,7 +40357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40328,7 +40380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7704, 7846), }); declarations.push(Declaration { - id: DeclarationId(1299), + id: DeclarationId(1301), name: Some("rust_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40343,7 +40395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40366,7 +40418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7848, 7990), }); declarations.push(Declaration { - id: DeclarationId(1300), + id: DeclarationId(1302), name: Some("rust_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40381,7 +40433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40404,7 +40456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7992, 8134), }); declarations.push(Declaration { - id: DeclarationId(1301), + id: DeclarationId(1303), name: Some("rust_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40419,7 +40471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40442,7 +40494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8136, 8299), }); declarations.push(Declaration { - id: DeclarationId(1302), + id: DeclarationId(1304), name: Some("rust_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40457,7 +40509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40480,7 +40532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8301, 8452), }); declarations.push(Declaration { - id: DeclarationId(1303), + id: DeclarationId(1305), name: Some("rust_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40495,7 +40547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40519,7 +40571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -40539,7 +40591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8454, 8699), }); declarations.push(Declaration { - id: DeclarationId(1304), + id: DeclarationId(1306), name: Some("rust_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40554,7 +40606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40577,7 +40629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8701, 8853), }); declarations.push(Declaration { - id: DeclarationId(1305), + id: DeclarationId(1307), name: Some("rust_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40592,7 +40644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40617,7 +40669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -40636,7 +40688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -40657,7 +40709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -40678,7 +40730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8855, 9251), }); declarations.push(Declaration { - id: DeclarationId(1306), + id: DeclarationId(1308), name: Some("rust_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40693,7 +40745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40718,7 +40770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -40737,7 +40789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -40756,7 +40808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -40777,7 +40829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9253, 9651), }); declarations.push(Declaration { - id: DeclarationId(1307), + id: DeclarationId(1309), name: Some("rust_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40792,7 +40844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40815,7 +40867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9653, 9811), }); declarations.push(Declaration { - id: DeclarationId(1308), + id: DeclarationId(1310), name: Some("rust_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40830,7 +40882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40853,7 +40905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9813, 9971), }); declarations.push(Declaration { - id: DeclarationId(1309), + id: DeclarationId(1311), name: Some("rust_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40868,7 +40920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40891,7 +40943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9973, 10146), }); declarations.push(Declaration { - id: DeclarationId(1310), + id: DeclarationId(1312), name: Some("rust_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40906,7 +40958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40929,7 +40981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10148, 10296), }); declarations.push(Declaration { - id: DeclarationId(1311), + id: DeclarationId(1313), name: Some("rust_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40944,7 +40996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40969,7 +41021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10298, 10487), }); declarations.push(Declaration { - id: DeclarationId(1312), + id: DeclarationId(1314), name: Some("rust_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40984,7 +41036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41007,7 +41059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10489, 10653), }); declarations.push(Declaration { - id: DeclarationId(1313), + id: DeclarationId(1315), name: Some("rust_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41022,7 +41074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41047,7 +41099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -41066,7 +41118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -41087,7 +41139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10655, 10957), }); declarations.push(Declaration { - id: DeclarationId(1314), + id: DeclarationId(1316), name: Some("rust_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41102,7 +41154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41129,7 +41181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -41148,7 +41200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -41169,7 +41221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10959, 11300), }); declarations.push(Declaration { - id: DeclarationId(1315), + id: DeclarationId(1317), name: Some("rust_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41184,7 +41236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41211,7 +41263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -41230,7 +41282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -41251,7 +41303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11302, 11647), }); declarations.push(Declaration { - id: DeclarationId(1316), + id: DeclarationId(1318), name: Some("rust_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41266,7 +41318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41292,7 +41344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -41312,7 +41364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11649, 11925), }); declarations.push(Declaration { - id: DeclarationId(1317), + id: DeclarationId(1319), name: Some("rust_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41327,7 +41379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41354,7 +41406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -41373,7 +41425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -41394,7 +41446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11927, 12244), }); declarations.push(Declaration { - id: DeclarationId(1318), + id: DeclarationId(1320), name: Some("rust_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41409,7 +41461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41434,7 +41486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -41453,7 +41505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -41474,7 +41526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12246, 12566), }); declarations.push(Declaration { - id: DeclarationId(1319), + id: DeclarationId(1321), name: Some("rust_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41489,7 +41541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41514,7 +41566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -41533,7 +41585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -41552,7 +41604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -41573,7 +41625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12568, 12981), }); declarations.push(Declaration { - id: DeclarationId(1320), + id: DeclarationId(1322), name: Some("rust_element_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41588,7 +41640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41612,7 +41664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -41632,7 +41684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12983, 13224), }); declarations.push(Declaration { - id: DeclarationId(1321), + id: DeclarationId(1323), name: Some("rust_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41647,7 +41699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41672,7 +41724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -41691,7 +41743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -41712,7 +41764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13226, 13546), }); declarations.push(Declaration { - id: DeclarationId(1322), + id: DeclarationId(1324), name: Some("rust_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41727,7 +41779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41751,7 +41803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -41771,7 +41823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13548, 13793), }); declarations.push(Declaration { - id: DeclarationId(1323), + id: DeclarationId(1325), name: Some("rust_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41786,7 +41838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41810,7 +41862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -41830,7 +41882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13795, 14040), }); declarations.push(Declaration { - id: DeclarationId(1324), + id: DeclarationId(1326), name: Some("rust_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41845,7 +41897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41869,7 +41921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -41889,7 +41941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14042, 14305), }); declarations.push(Declaration { - id: DeclarationId(1325), + id: DeclarationId(1327), name: Some("rust_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41904,7 +41956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41929,7 +41981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -41950,7 +42002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -41971,7 +42023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14307, 14644), }); declarations.push(Declaration { - id: DeclarationId(1326), + id: DeclarationId(1328), name: Some("rust_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41986,7 +42038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42009,7 +42061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14646, 14801), }); declarations.push(Declaration { - id: DeclarationId(1327), + id: DeclarationId(1329), name: Some("rust_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42024,7 +42076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42047,7 +42099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14803, 14955), }); declarations.push(Declaration { - id: DeclarationId(1328), + id: DeclarationId(1330), name: Some("rust_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42062,7 +42114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42085,7 +42137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14957, 15109), }); declarations.push(Declaration { - id: DeclarationId(1329), + id: DeclarationId(1331), name: Some("rust_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42100,7 +42152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42123,7 +42175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15111, 15278), }); declarations.push(Declaration { - id: DeclarationId(1330), + id: DeclarationId(1332), name: Some("rust_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42138,7 +42190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42163,7 +42215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -42182,7 +42234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -42203,7 +42255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -42224,7 +42276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -42245,7 +42297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -42266,7 +42318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -42287,7 +42339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -42308,7 +42360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -42329,7 +42381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -42348,7 +42400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -42369,7 +42421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15280, 16301), }); declarations.push(Declaration { - id: DeclarationId(1331), + id: DeclarationId(1333), name: Some("rust_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42384,7 +42436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42407,7 +42459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16303, 16464), }); declarations.push(Declaration { - id: DeclarationId(1332), + id: DeclarationId(1334), name: Some("rust_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42422,7 +42474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42445,7 +42497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16466, 16627), }); declarations.push(Declaration { - id: DeclarationId(1333), + id: DeclarationId(1335), name: Some("rust_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42460,7 +42512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42483,7 +42535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16629, 16781), }); declarations.push(Declaration { - id: DeclarationId(1334), + id: DeclarationId(1336), name: Some("rust_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42498,7 +42550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42521,7 +42573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16783, 16944), }); declarations.push(Declaration { - id: DeclarationId(1335), + id: DeclarationId(1337), name: Some("rust_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42536,7 +42588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42559,7 +42611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16946, 17116), }); declarations.push(Declaration { - id: DeclarationId(1336), + id: DeclarationId(1338), name: Some("rust_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42574,7 +42626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42597,7 +42649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17118, 17282), }); declarations.push(Declaration { - id: DeclarationId(1337), + id: DeclarationId(1339), name: Some("rust_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42612,7 +42664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42639,7 +42691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -42660,7 +42712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -42681,7 +42733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17284, 17639), }); declarations.push(Declaration { - id: DeclarationId(1338), + id: DeclarationId(1340), name: Some("rust_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42696,7 +42748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42721,7 +42773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -42742,7 +42794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -42761,7 +42813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -42780,7 +42832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -42801,7 +42853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17641, 18129), }); declarations.push(Declaration { - id: DeclarationId(1339), + id: DeclarationId(1341), name: Some("rust_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42816,7 +42868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42839,7 +42891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18131, 18283), }); declarations.push(Declaration { - id: DeclarationId(1340), + id: DeclarationId(1342), name: Some("rust_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42854,7 +42906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42879,7 +42931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -42898,7 +42950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -42919,7 +42971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -42938,7 +42990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -42959,7 +43011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -42980,7 +43032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18285, 19058), }); declarations.push(Declaration { - id: DeclarationId(1341), + id: DeclarationId(1343), name: Some("rust_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42995,7 +43047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43020,7 +43072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43039,7 +43091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -43058,7 +43110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -43079,7 +43131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43098,7 +43150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43119,7 +43171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19060, 19632), }); declarations.push(Declaration { - id: DeclarationId(1342), + id: DeclarationId(1344), name: Some("rust_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43134,7 +43186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43159,7 +43211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43178,7 +43230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -43197,7 +43249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -43218,7 +43270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43237,7 +43289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43258,7 +43310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -43279,7 +43331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19634, 20301), }); declarations.push(Declaration { - id: DeclarationId(1343), + id: DeclarationId(1345), name: Some("rust_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43294,7 +43346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43319,7 +43371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43338,7 +43390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -43357,7 +43409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -43376,7 +43428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -43395,7 +43447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -43416,7 +43468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43435,7 +43487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43456,7 +43508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20303, 21012), }); declarations.push(Declaration { - id: DeclarationId(1344), + id: DeclarationId(1346), name: Some("rust_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43471,7 +43523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43496,7 +43548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43515,7 +43567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -43536,7 +43588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43555,7 +43607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -43574,7 +43626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43595,7 +43647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -43616,7 +43668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -43637,7 +43689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21014, 21774), }); declarations.push(Declaration { - id: DeclarationId(1345), + id: DeclarationId(1347), name: Some("rust_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43652,7 +43704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43675,7 +43727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21776, 21924), }); declarations.push(Declaration { - id: DeclarationId(1346), + id: DeclarationId(1348), name: Some("rust_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43690,7 +43742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43717,7 +43769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -43736,7 +43788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -43755,7 +43807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -43776,7 +43828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -43797,7 +43849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21926, 22406), }); declarations.push(Declaration { - id: DeclarationId(1347), + id: DeclarationId(1349), name: Some("rust_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43812,7 +43864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43838,7 +43890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -43858,7 +43910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22619, 22879), }); declarations.push(Declaration { - id: DeclarationId(1348), + id: DeclarationId(1350), name: Some("rust_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43873,7 +43925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43898,7 +43950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22881, 23054), }); declarations.push(Declaration { - id: DeclarationId(1349), + id: DeclarationId(1351), name: Some("rust_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43913,7 +43965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43940,7 +43992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -43959,7 +44011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -43980,7 +44032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -44001,7 +44053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23056, 23473), }); declarations.push(Declaration { - id: DeclarationId(1350), + id: DeclarationId(1352), name: Some("rust_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44016,7 +44068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44043,7 +44095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44062,7 +44114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -44083,7 +44135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23475, 23803), }); declarations.push(Declaration { - id: DeclarationId(1351), + id: DeclarationId(1353), name: Some("rust_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44098,7 +44150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44125,7 +44177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44144,7 +44196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -44163,7 +44215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44184,7 +44236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23805, 24226), }); declarations.push(Declaration { - id: DeclarationId(1352), + id: DeclarationId(1354), name: Some("rust_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44199,7 +44251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44224,7 +44276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24228, 24410), }); declarations.push(Declaration { - id: DeclarationId(1353), + id: DeclarationId(1355), name: Some("rust_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44239,7 +44291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44264,7 +44316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24412, 24585), }); declarations.push(Declaration { - id: DeclarationId(1354), + id: DeclarationId(1356), name: Some("rust_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44279,7 +44331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44306,7 +44358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44325,7 +44377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -44344,7 +44396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44365,7 +44417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24587, 25017), }); declarations.push(Declaration { - id: DeclarationId(1355), + id: DeclarationId(1357), name: Some("rust_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44380,7 +44432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44407,7 +44459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -44428,7 +44480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -44447,7 +44499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -44466,7 +44518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44487,7 +44539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25019, 25523), }); declarations.push(Declaration { - id: DeclarationId(1356), + id: DeclarationId(1358), name: Some("rust_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44502,7 +44554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44529,7 +44581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -44548,7 +44600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -44567,7 +44619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44588,7 +44640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25525, 25950), }); declarations.push(Declaration { - id: DeclarationId(1357), + id: DeclarationId(1359), name: Some("rust_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44603,7 +44655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44630,7 +44682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44649,7 +44701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -44668,7 +44720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44689,7 +44741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25952, 26389), }); declarations.push(Declaration { - id: DeclarationId(1358), + id: DeclarationId(1360), name: Some("rust_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44704,7 +44756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44729,7 +44781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26391, 26573), }); declarations.push(Declaration { - id: DeclarationId(1359), + id: DeclarationId(1361), name: Some("rust_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44744,7 +44796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44769,7 +44821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26575, 26757), }); declarations.push(Declaration { - id: DeclarationId(1360), + id: DeclarationId(1362), name: Some("rust_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44784,7 +44836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44809,7 +44861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26759, 26932), }); declarations.push(Declaration { - id: DeclarationId(1361), + id: DeclarationId(1363), name: Some("rust_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44824,7 +44876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44843,7 +44895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27787, 27932), }); declarations.push(Declaration { - id: DeclarationId(1362), + id: DeclarationId(1364), name: Some("rust_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44858,7 +44910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44877,7 +44929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27934, 28079), }); declarations.push(Declaration { - id: DeclarationId(1363), + id: DeclarationId(1365), name: Some("rust_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44892,7 +44944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44911,7 +44963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28081, 28226), }); declarations.push(Declaration { - id: DeclarationId(1364), + id: DeclarationId(1366), name: Some("rust_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44926,7 +44978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44947,7 +44999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28228, 28386), }); declarations.push(Declaration { - id: DeclarationId(1365), + id: DeclarationId(1367), name: Some("rust_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44962,7 +45014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44981,7 +45033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28836, 28980), }); declarations.push(Declaration { - id: DeclarationId(1366), + id: DeclarationId(1368), name: Some("rust_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44996,7 +45048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45015,7 +45067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28982, 29133), }); declarations.push(Declaration { - id: DeclarationId(1367), + id: DeclarationId(1369), name: Some("rust_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45030,7 +45082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45049,7 +45101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29135, 29286), }); declarations.push(Declaration { - id: DeclarationId(1368), + id: DeclarationId(1370), name: Some("rust_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45064,7 +45116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45083,7 +45135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29288, 29453), }); declarations.push(Declaration { - id: DeclarationId(1369), + id: DeclarationId(1371), name: Some("rust_string_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45098,7 +45150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45117,7 +45169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29646, 29796), }); declarations.push(Declaration { - id: DeclarationId(1370), + id: DeclarationId(1372), name: Some("rust_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45132,7 +45184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45151,7 +45203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29798, 29942), }); declarations.push(Declaration { - id: DeclarationId(1371), + id: DeclarationId(1373), name: Some("rust_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45166,7 +45218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45185,7 +45237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29944, 30095), }); declarations.push(Declaration { - id: DeclarationId(1372), + id: DeclarationId(1374), name: Some("rust_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45200,7 +45252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45219,7 +45271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30097, 30248), }); declarations.push(Declaration { - id: DeclarationId(1373), + id: DeclarationId(1375), name: Some("rust_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45234,7 +45286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45253,7 +45305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30250, 30415), }); declarations.push(Declaration { - id: DeclarationId(1374), + id: DeclarationId(1376), name: Some("rust_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45268,7 +45320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45287,7 +45339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30417, 30560), }); declarations.push(Declaration { - id: DeclarationId(1375), + id: DeclarationId(1377), name: Some("rust_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45302,7 +45354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45321,7 +45373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30562, 30706), }); declarations.push(Declaration { - id: DeclarationId(1376), + id: DeclarationId(1378), name: Some("rust_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45336,7 +45388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45355,7 +45407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30708, 30851), }); declarations.push(Declaration { - id: DeclarationId(1377), + id: DeclarationId(1379), name: Some("rust_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45370,7 +45422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45389,7 +45441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30853, 30997), }); declarations.push(Declaration { - id: DeclarationId(1378), + id: DeclarationId(1380), name: Some("rust_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45404,7 +45456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45423,7 +45475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30999, 31152), }); declarations.push(Declaration { - id: DeclarationId(1379), + id: DeclarationId(1381), name: Some("rust_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45438,7 +45490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45457,7 +45509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31154, 31307), }); declarations.push(Declaration { - id: DeclarationId(1380), + id: DeclarationId(1382), name: Some("rust_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -45472,11 +45524,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1079)), + FieldValue::Reference(DeclarationId(1081)), ), ( "carrier".to_string(), @@ -45492,7 +45544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32057, 32196), }); declarations.push(Declaration { - id: DeclarationId(1381), + id: DeclarationId(1383), name: Some("rust_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -45507,11 +45559,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1077)), + FieldValue::Reference(DeclarationId(1079)), ), ( "carrier".to_string(), @@ -45527,7 +45579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32198, 32345), }); declarations.push(Declaration { - id: DeclarationId(1382), + id: DeclarationId(1384), name: Some("rust_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -45542,11 +45594,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1080)), + FieldValue::Reference(DeclarationId(1082)), ), ( "carrier".to_string(), @@ -45563,7 +45615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517), }); declarations.push(Declaration { - id: DeclarationId(1383), + id: DeclarationId(1385), name: Some("rust_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45578,7 +45630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45587,7 +45639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -45600,7 +45652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33894, 34036), }); declarations.push(Declaration { - id: DeclarationId(1384), + id: DeclarationId(1386), name: Some("rust_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45615,7 +45667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45624,7 +45676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -45635,7 +45687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45649,7 +45701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34038, 34234), }); declarations.push(Declaration { - id: DeclarationId(1385), + id: DeclarationId(1387), name: Some("rust_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45664,7 +45716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45673,7 +45725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -45685,7 +45737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45695,7 +45747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45710,7 +45762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34236, 34457), }); declarations.push(Declaration { - id: DeclarationId(1386), + id: DeclarationId(1388), name: Some("rust_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45725,7 +45777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45734,7 +45786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1935), + constructor: DeclarationId(1937), payload: vec![], }, ), @@ -45746,7 +45798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45756,7 +45808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45771,7 +45823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34459, 34686), }); declarations.push(Declaration { - id: DeclarationId(1387), + id: DeclarationId(1389), name: Some("rust_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45786,7 +45838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45795,7 +45847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1936), + constructor: DeclarationId(1938), payload: vec![], }, ), @@ -45806,7 +45858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -45820,7 +45872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34688, 34875), }); declarations.push(Declaration { - id: DeclarationId(1388), + id: DeclarationId(1390), name: Some("rust_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45835,7 +45887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45853,7 +45905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34877, 35020), }); declarations.push(Declaration { - id: DeclarationId(1389), + id: DeclarationId(1391), name: Some("rust_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45868,7 +45920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45888,7 +45940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35299, 35470), }); declarations.push(Declaration { - id: DeclarationId(1390), + id: DeclarationId(1392), name: Some("rust_lookup_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45903,7 +45955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45921,7 +45973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35472, 35622), }); declarations.push(Declaration { - id: DeclarationId(1391), + id: DeclarationId(1393), name: Some("rust_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45936,7 +45988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45956,7 +46008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35624, 35774), }); declarations.push(Declaration { - id: DeclarationId(1392), + id: DeclarationId(1394), name: Some("rust_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45971,7 +46023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45980,7 +46032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1937), + constructor: DeclarationId(1939), payload: vec![], }, ), @@ -45991,7 +46043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46005,7 +46057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35776, 35968), }); declarations.push(Declaration { - id: DeclarationId(1393), + id: DeclarationId(1395), name: Some("rust_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46020,7 +46072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46029,7 +46081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1938), + constructor: DeclarationId(1940), payload: vec![], }, ), @@ -46041,7 +46093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46051,7 +46103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -46061,7 +46113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46076,7 +46128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35970, 36231), }); declarations.push(Declaration { - id: DeclarationId(1394), + id: DeclarationId(1396), name: Some("rust_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46091,7 +46143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46100,7 +46152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1939), + constructor: DeclarationId(1941), payload: vec![], }, ), @@ -46112,7 +46164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46122,7 +46174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46137,7 +46189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 36233, 36451), }); declarations.push(Declaration { - id: DeclarationId(1395), + id: DeclarationId(1397), name: Some("rust_filter_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46152,7 +46204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46161,7 +46213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1940), + constructor: DeclarationId(1942), payload: vec![], }, ), @@ -46173,7 +46225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46183,7 +46235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46198,7 +46250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 36453, 36680), }); declarations.push(Declaration { - id: DeclarationId(1396), + id: DeclarationId(1398), name: Some("rust_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46213,7 +46265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46222,7 +46274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1941), + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -46234,7 +46286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46244,7 +46296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46259,7 +46311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 36682, 36915), }); declarations.push(Declaration { - id: DeclarationId(1397), + id: DeclarationId(1399), name: Some("rust_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(910), @@ -46274,7 +46326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46283,17 +46335,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1501)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1503)), ), ( "scrutinee".to_string(), @@ -46325,7 +46377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37143, 37447), }); declarations.push(Declaration { - id: DeclarationId(1398), + id: DeclarationId(1400), name: Some("rust_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -46357,7 +46409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37449, 37587), }); declarations.push(Declaration { - id: DeclarationId(1399), + id: DeclarationId(1401), name: Some("rust_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(913), @@ -46391,7 +46443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37589, 37742), }); declarations.push(Declaration { - id: DeclarationId(1400), + id: DeclarationId(1402), name: Some("rust_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(915), @@ -46436,7 +46488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37744, 37934), }); declarations.push(Declaration { - id: DeclarationId(1401), + id: DeclarationId(1403), name: Some("rust_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -46468,7 +46520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37936, 38048), }); declarations.push(Declaration { - id: DeclarationId(1402), + id: DeclarationId(1404), name: Some("rust_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -46490,7 +46542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38050, 38110), }); declarations.push(Declaration { - id: DeclarationId(1403), + id: DeclarationId(1405), name: Some("rust_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(918), @@ -46536,7 +46588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38112, 38390), }); declarations.push(Declaration { - id: DeclarationId(1404), + id: DeclarationId(1406), name: Some("rust_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -46558,7 +46610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38392, 38480), }); declarations.push(Declaration { - id: DeclarationId(1405), + id: DeclarationId(1407), name: Some("rust_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -46604,7 +46656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38482, 38784), }); declarations.push(Declaration { - id: DeclarationId(1406), + id: DeclarationId(1408), name: Some("rust_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -46636,7 +46688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38786, 38999), }); declarations.push(Declaration { - id: DeclarationId(1407), + id: DeclarationId(1409), name: Some("rust_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -46693,9 +46745,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39001, 39336), }); - declarations.push(Declaration { id: DeclarationId(1408), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); + declarations.push(Declaration { id: DeclarationId(1410), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); declarations.push(Declaration { - id: DeclarationId(1409), + id: DeclarationId(1411), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -46739,7 +46791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39931, 40203), }); declarations.push(Declaration { - id: DeclarationId(1410), + id: DeclarationId(1412), name: Some("rust_rendering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -46755,14 +46807,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "read".to_string(), FieldValue::Variant { - constructor: DeclarationId(1944), + constructor: DeclarationId(1946), payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { - constructor: DeclarationId(1946), + constructor: DeclarationId(1948), payload: vec![], }, ), @@ -46773,7 +46825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40205, 40286), }); declarations.push(Declaration { - id: DeclarationId(1411), + id: DeclarationId(1413), name: Some("rust_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -46788,51 +46840,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1398)), + FieldValue::Reference(DeclarationId(1400)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1399)), + FieldValue::Reference(DeclarationId(1401)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1400)), + FieldValue::Reference(DeclarationId(1402)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1401)), + FieldValue::Reference(DeclarationId(1403)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1402)), + FieldValue::Reference(DeclarationId(1404)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1403)), + FieldValue::Reference(DeclarationId(1405)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1404)), + FieldValue::Reference(DeclarationId(1406)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1405)), + FieldValue::Reference(DeclarationId(1407)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1406)), + FieldValue::Reference(DeclarationId(1408)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1409)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1410)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1411)), ), ], }), @@ -46841,7 +46893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40288, 40733), }); declarations.push(Declaration { - id: DeclarationId(1412), + id: DeclarationId(1414), name: Some("rust_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(827), @@ -46877,7 +46929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42157, 42296), }); declarations.push(Declaration { - id: DeclarationId(1413), + id: DeclarationId(1415), name: Some("rust_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(818), @@ -46893,55 +46945,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(1795), + constructor: DeclarationId(1797), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1798), + constructor: DeclarationId(1800), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1802), + constructor: DeclarationId(1804), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(1804), + constructor: DeclarationId(1806), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(1807), + constructor: DeclarationId(1809), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1810), + constructor: DeclarationId(1812), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(1813), + constructor: DeclarationId(1815), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1412)), + FieldValue::Reference(DeclarationId(1414)), ), ( "post_emit_verifier".to_string(), @@ -46973,7 +47025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1816), + constructor: DeclarationId(1818), payload: vec![], }, ), @@ -46986,7 +47038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42298, 42911), }); declarations.push(Declaration { - id: DeclarationId(1414), + id: DeclarationId(1416), name: Some("rust_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(819), @@ -47001,11 +47053,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1413)), + FieldValue::Reference(DeclarationId(1415)), ), ], }), @@ -47014,7 +47066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42913, 43043), }); declarations.push(Declaration { - id: DeclarationId(1415), + id: DeclarationId(1417), name: Some("rust_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47038,7 +47090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44145, 44248), }); declarations.push(Declaration { - id: DeclarationId(1416), + id: DeclarationId(1418), name: Some("rust_node_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47062,7 +47114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44250, 44353), }); declarations.push(Declaration { - id: DeclarationId(1417), + id: DeclarationId(1419), name: Some("rust_resolve_producer_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47086,7 +47138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44355, 44482), }); declarations.push(Declaration { - id: DeclarationId(1418), + id: DeclarationId(1420), name: Some("port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47105,11 +47157,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47118,7 +47170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44615), }); declarations.push(Declaration { - id: DeclarationId(1419), + id: DeclarationId(1421), name: Some("node_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47137,11 +47189,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1418)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47150,7 +47202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44617, 44748), }); declarations.push(Declaration { - id: DeclarationId(1420), + id: DeclarationId(1422), name: Some("resolve_producer_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47169,11 +47221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1417)), + FieldValue::Reference(DeclarationId(1419)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47182,7 +47234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44750, 44917), }); declarations.push(Declaration { - id: DeclarationId(1421), + id: DeclarationId(1423), name: Some("rust_lane2_workflow_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47206,7 +47258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45428, 45557), }); declarations.push(Declaration { - id: DeclarationId(1422), + id: DeclarationId(1424), name: Some("lane2_workflow_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47225,11 +47277,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1421)), + FieldValue::Reference(DeclarationId(1423)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47238,7 +47290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45559, 45726), }); declarations.push(Declaration { - id: DeclarationId(1423), + id: DeclarationId(1425), name: Some("rust_workflow_root_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47262,7 +47314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46421, 46535), }); declarations.push(Declaration { - id: DeclarationId(1424), + id: DeclarationId(1426), name: Some("workflow_root_port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47281,11 +47333,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1425)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47294,7 +47346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46537, 46710), }); declarations.push(Declaration { - id: DeclarationId(1425), + id: DeclarationId(1427), name: Some("rust_workflow_root".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -47309,7 +47361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -47332,7 +47384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47122, 47283), }); declarations.push(Declaration { - id: DeclarationId(1426), + id: DeclarationId(1428), name: Some("rust_declaration_by_id_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47356,7 +47408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47610, 47733), }); declarations.push(Declaration { - id: DeclarationId(1427), + id: DeclarationId(1429), name: Some("declaration_by_id_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47375,11 +47427,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1426)), + FieldValue::Reference(DeclarationId(1428)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47388,7 +47440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47735, 47905), }); declarations.push(Declaration { - id: DeclarationId(1428), + id: DeclarationId(1430), name: Some("CompilerHostRealization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47407,21 +47459,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502), }); declarations.push(Declaration { - id: DeclarationId(1429), + id: DeclarationId(1431), name: Some("PipelineSnapshotKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SnapshotSurface".to_string(), - ty: DeclarationId(2244), + ty: DeclarationId(2246), }, Field { label: "SnapshotDag".to_string(), - ty: DeclarationId(2245), + ty: DeclarationId(2247), }, Field { label: "SnapshotText".to_string(), - ty: DeclarationId(2246), + ty: DeclarationId(2248), }, ], }, @@ -47436,21 +47488,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576), }); declarations.push(Declaration { - id: DeclarationId(1430), + id: DeclarationId(1432), name: Some("PipelineStageBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "stage".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "realization".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "snapshot".to_string(), - ty: DeclarationId(1429), + ty: DeclarationId(1431), }, ], }, @@ -47465,7 +47517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694), }); declarations.push(Declaration { - id: DeclarationId(1431), + id: DeclarationId(1433), name: Some("parse_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47475,7 +47527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47489,7 +47541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780), }); declarations.push(Declaration { - id: DeclarationId(1432), + id: DeclarationId(1434), name: Some("lower_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47499,7 +47551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47513,7 +47565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866), }); declarations.push(Declaration { - id: DeclarationId(1433), + id: DeclarationId(1435), name: Some("infer_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47523,7 +47575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47537,7 +47589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952), }); declarations.push(Declaration { - id: DeclarationId(1434), + id: DeclarationId(1436), name: Some("compute_ownership_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47547,7 +47599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47563,7 +47615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062), }); declarations.push(Declaration { - id: DeclarationId(1435), + id: DeclarationId(1437), name: Some("emit_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47573,7 +47625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47587,7 +47639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146), }); declarations.push(Declaration { - id: DeclarationId(1436), + id: DeclarationId(1438), name: Some("lens_complexity_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47597,7 +47649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47613,31 +47665,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252), }); declarations.push(Declaration { - id: DeclarationId(1437), + id: DeclarationId(1439), name: Some("parse_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1443)), + FieldValue::Reference(DeclarationId(1445)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1431)), + FieldValue::Reference(DeclarationId(1433)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2244), + constructor: DeclarationId(2246), payload: vec![], }, ), @@ -47648,31 +47700,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), }); declarations.push(Declaration { - id: DeclarationId(1438), + id: DeclarationId(1440), name: Some("lower_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1444)), + FieldValue::Reference(DeclarationId(1446)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1432)), + FieldValue::Reference(DeclarationId(1434)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47683,31 +47735,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), }); declarations.push(Declaration { - id: DeclarationId(1439), + id: DeclarationId(1441), name: Some("infer_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1445)), + FieldValue::Reference(DeclarationId(1447)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1433)), + FieldValue::Reference(DeclarationId(1435)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47718,31 +47770,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), }); declarations.push(Declaration { - id: DeclarationId(1440), + id: DeclarationId(1442), name: Some("compute_ownership_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1446)), + FieldValue::Reference(DeclarationId(1448)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1434)), + FieldValue::Reference(DeclarationId(1436)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47753,31 +47805,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), }); declarations.push(Declaration { - id: DeclarationId(1441), + id: DeclarationId(1443), name: Some("lens_complexity_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1447)), + FieldValue::Reference(DeclarationId(1449)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1436)), + FieldValue::Reference(DeclarationId(1438)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47788,31 +47840,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), }); declarations.push(Declaration { - id: DeclarationId(1442), + id: DeclarationId(1444), name: Some("emit_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1448)), + FieldValue::Reference(DeclarationId(1450)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1435)), + FieldValue::Reference(DeclarationId(1437)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2246), + constructor: DeclarationId(2248), payload: vec![], }, ), @@ -47823,12 +47875,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076), }); declarations.push(Declaration { - id: DeclarationId(1443), + id: DeclarationId(1445), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197), DeclarationId(197)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1431)), + body: ArrowBody::ExternalRealization(DeclarationId(1433)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47841,12 +47893,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140), }); declarations.push(Declaration { - id: DeclarationId(1444), + id: DeclarationId(1446), name: Some("lower".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1432)), + body: ArrowBody::ExternalRealization(DeclarationId(1434)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47859,12 +47911,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), }); declarations.push(Declaration { - id: DeclarationId(1445), + id: DeclarationId(1447), name: Some("infer".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1433)), + body: ArrowBody::ExternalRealization(DeclarationId(1435)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47877,12 +47929,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), }); declarations.push(Declaration { - id: DeclarationId(1446), + id: DeclarationId(1448), name: Some("compute_ownership".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1434)), + body: ArrowBody::ExternalRealization(DeclarationId(1436)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47895,12 +47947,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288), }); declarations.push(Declaration { - id: DeclarationId(1447), + id: DeclarationId(1449), name: Some("lens_complexity".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1436)), + body: ArrowBody::ExternalRealization(DeclarationId(1438)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47913,7 +47965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347), }); declarations.push(Declaration { - id: DeclarationId(1448), + id: DeclarationId(1450), name: Some("emit".to_string()), connective: TypeConnective::Arrow { inputs: vec![ @@ -47923,7 +47975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(928), ], output: DeclarationId(197), - body: ArrowBody::ExternalRealization(DeclarationId(1435)), + body: ArrowBody::ExternalRealization(DeclarationId(1437)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47936,7 +47988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460), }); declarations.push(Declaration { - id: DeclarationId(1449), + id: DeclarationId(1451), name: Some("compile".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(928)], @@ -47958,11 +48010,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605), }); declarations.push(Declaration { - id: DeclarationId(1450), + id: DeclarationId(1452), name: Some("from_symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], - output: DeclarationId(2247), + output: DeclarationId(2249), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -47980,7 +48032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771), }); declarations.push(Declaration { - id: DeclarationId(1451), + id: DeclarationId(1453), name: Some("symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(722)], @@ -47998,7 +48050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214), }); declarations.push(Declaration { - id: DeclarationId(1452), + id: DeclarationId(1454), name: Some("algebra_field_name".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(722)], @@ -48016,7 +48068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017), }); declarations.push(Declaration { - id: DeclarationId(1453), + id: DeclarationId(1455), name: Some("LensRegistryEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -48045,15 +48097,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045), }); declarations.push(Declaration { - id: DeclarationId(1454), + id: DeclarationId(1456), name: Some("lens_cost_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48081,15 +48133,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2214), }); declarations.push(Declaration { - id: DeclarationId(1455), + id: DeclarationId(1457), name: Some("lens_cost_symbolic_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48117,15 +48169,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2216, 2404), }); declarations.push(Declaration { - id: DeclarationId(1456), + id: DeclarationId(1458), name: Some("lens_effect_enumeration_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48153,15 +48205,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2406, 2623), }); declarations.push(Declaration { - id: DeclarationId(1457), + id: DeclarationId(1459), name: Some("lens_provenance_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48189,15 +48241,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2625, 2810), }); declarations.push(Declaration { - id: DeclarationId(1458), + id: DeclarationId(1460), name: Some("lens_structural_resolution_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48228,15 +48280,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2812, 3041), }); declarations.push(Declaration { - id: DeclarationId(1459), + id: DeclarationId(1461), name: Some("lens_unused_parameters_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48264,15 +48316,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3043, 3256), }); declarations.push(Declaration { - id: DeclarationId(1460), + id: DeclarationId(1462), name: Some("lens_infer_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48300,15 +48352,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3883, 4075), }); declarations.push(Declaration { - id: DeclarationId(1461), + id: DeclarationId(1463), name: Some("lens_variant_payload_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48336,15 +48388,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4077, 4277), }); declarations.push(Declaration { - id: DeclarationId(1462), + id: DeclarationId(1464), name: Some("lens_lower_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48372,17 +48424,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4527, 4719), }); declarations.push(Declaration { - id: DeclarationId(1463), + id: DeclarationId(1465), name: Some("IntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OrderedRingAlgebra".to_string(), - ty: DeclarationId(2248), + ty: DeclarationId(2250), }, Field { label: "SemiringAlgebra".to_string(), - ty: DeclarationId(2249), + ty: DeclarationId(2251), }, ], }, @@ -48397,17 +48449,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5528, 5590), }); declarations.push(Declaration { - id: DeclarationId(1464), + id: DeclarationId(1466), name: Some("NonIntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BooleanAlgebraAlgebra".to_string(), - ty: DeclarationId(2250), + ty: DeclarationId(2252), }, Field { label: "TerminalAlgebra".to_string(), - ty: DeclarationId(2251), + ty: DeclarationId(2253), }, ], }, @@ -48422,37 +48474,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5592, 5660), }); declarations.push(Declaration { - id: DeclarationId(1465), + id: DeclarationId(1467), name: Some("TargetCarrier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BitCarrier".to_string(), - ty: DeclarationId(2252), + ty: DeclarationId(2254), }, Field { label: "ByteCarrier".to_string(), - ty: DeclarationId(2253), + ty: DeclarationId(2255), }, Field { label: "Word16Carrier".to_string(), - ty: DeclarationId(2254), + ty: DeclarationId(2256), }, Field { label: "Word32Carrier".to_string(), - ty: DeclarationId(2255), + ty: DeclarationId(2257), }, Field { label: "Word64Carrier".to_string(), - ty: DeclarationId(2256), + ty: DeclarationId(2258), }, Field { label: "Word128Carrier".to_string(), - ty: DeclarationId(2257), + ty: DeclarationId(2259), }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2258), + ty: DeclarationId(2260), }, ], }, @@ -48467,21 +48519,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7234, 7376), }); declarations.push(Declaration { - id: DeclarationId(1466), + id: DeclarationId(1468), name: Some("IntegerOverflow".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TwoComplementWrap".to_string(), - ty: DeclarationId(2259), + ty: DeclarationId(2261), }, Field { label: "Saturating".to_string(), - ty: DeclarationId(2260), + ty: DeclarationId(2262), }, Field { label: "Trap".to_string(), - ty: DeclarationId(2261), + ty: DeclarationId(2263), }, ], }, @@ -48496,17 +48548,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8093, 8159), }); declarations.push(Declaration { - id: DeclarationId(1467), + id: DeclarationId(1469), name: Some("RustPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerPrimitive".to_string(), - ty: DeclarationId(2262), + ty: DeclarationId(2264), }, Field { label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2263), + ty: DeclarationId(2265), }, ], }, @@ -48521,94 +48573,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8914, 9696), }); declarations.push(Declaration { - id: DeclarationId(1468), + id: DeclarationId(1470), name: Some("rust_pilot_primitives".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1467), + value: DeclarationId(1469), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2264)), + meta_tag: Some(DeclarationId(2266)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2253), + constructor: DeclarationId(2255), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2254), + constructor: DeclarationId(2256), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2255), + constructor: DeclarationId(2257), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), FieldValue::Literal(LiteralBits::String("2147483647".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2256), + constructor: DeclarationId(2258), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -48617,21 +48669,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2257), + constructor: DeclarationId(2259), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -48642,84 +48694,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2253), + constructor: DeclarationId(2255), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2254), + constructor: DeclarationId(2256), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2255), + constructor: DeclarationId(2257), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2256), + constructor: DeclarationId(2258), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -48728,36 +48780,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2263), + constructor: DeclarationId(2265), payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { - constructor: DeclarationId(2250), + constructor: DeclarationId(2252), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2252), + constructor: DeclarationId(2254), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { - constructor: DeclarationId(2263), + constructor: DeclarationId(2265), payload: vec![ FieldValue::Literal(LiteralBits::String("()".to_string())), FieldValue::Variant { - constructor: DeclarationId(2251), + constructor: DeclarationId(2253), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2258), + constructor: DeclarationId(2260), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -48769,7 +48821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9996, 13318), }); declarations.push(Declaration { - id: DeclarationId(1469), + id: DeclarationId(1471), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48789,7 +48841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272), }); declarations.push(Declaration { - id: DeclarationId(1470), + id: DeclarationId(1472), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48809,7 +48861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434), }); declarations.push(Declaration { - id: DeclarationId(1471), + id: DeclarationId(1473), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48829,7 +48881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452), }); declarations.push(Declaration { - id: DeclarationId(1472), + id: DeclarationId(1474), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48849,7 +48901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569), }); declarations.push(Declaration { - id: DeclarationId(1473), + id: DeclarationId(1475), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48869,7 +48921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169), }); declarations.push(Declaration { - id: DeclarationId(1474), + id: DeclarationId(1476), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(614), DeclarationId(613)], @@ -48887,7 +48939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1475), + id: DeclarationId(1477), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48907,7 +48959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624), }); declarations.push(Declaration { - id: DeclarationId(1476), + id: DeclarationId(1478), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(616), DeclarationId(617)], @@ -48925,7 +48977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651), }); declarations.push(Declaration { - id: DeclarationId(1477), + id: DeclarationId(1479), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48945,7 +48997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349), }); declarations.push(Declaration { - id: DeclarationId(1478), + id: DeclarationId(1480), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48965,7 +49017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367), }); declarations.push(Declaration { - id: DeclarationId(1479), + id: DeclarationId(1481), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48985,7 +49037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), }); declarations.push(Declaration { - id: DeclarationId(1480), + id: DeclarationId(1482), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49005,7 +49057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693), }); declarations.push(Declaration { - id: DeclarationId(1481), + id: DeclarationId(1483), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(621)], @@ -49023,7 +49075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708), }); declarations.push(Declaration { - id: DeclarationId(1482), + id: DeclarationId(1484), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49043,7 +49095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720), }); declarations.push(Declaration { - id: DeclarationId(1483), + id: DeclarationId(1485), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49063,7 +49115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874), }); declarations.push(Declaration { - id: DeclarationId(1484), + id: DeclarationId(1486), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(624)], @@ -49081,7 +49133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(1485), + id: DeclarationId(1487), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49101,7 +49153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904), }); declarations.push(Declaration { - id: DeclarationId(1486), + id: DeclarationId(1488), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49121,7 +49173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137), }); declarations.push(Declaration { - id: DeclarationId(1487), + id: DeclarationId(1489), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49141,11 +49193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158), }); declarations.push(Declaration { - id: DeclarationId(1488), + id: DeclarationId(1490), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(626)], - output: DeclarationId(1487), + output: DeclarationId(1489), body: ArrowBody::NoBody, }, type_params: vec![], @@ -49159,7 +49211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158), }); declarations.push(Declaration { - id: DeclarationId(1489), + id: DeclarationId(1491), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49179,7 +49231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170), }); declarations.push(Declaration { - id: DeclarationId(1490), + id: DeclarationId(1492), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49199,7 +49251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363), }); declarations.push(Declaration { - id: DeclarationId(1491), + id: DeclarationId(1493), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49219,7 +49271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595), }); declarations.push(Declaration { - id: DeclarationId(1492), + id: DeclarationId(1494), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49239,7 +49291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209), }); declarations.push(Declaration { - id: DeclarationId(1493), + id: DeclarationId(1495), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -49259,13 +49311,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236), }); declarations.push(Declaration { - id: DeclarationId(1494), + id: DeclarationId(1496), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1493), + value: DeclarationId(1495), }], }, type_params: vec![], @@ -49279,7 +49331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237), }); declarations.push(Declaration { - id: DeclarationId(1495), + id: DeclarationId(1497), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49299,7 +49351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422), }); declarations.push(Declaration { - id: DeclarationId(1496), + id: DeclarationId(1498), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -49319,13 +49371,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461), }); declarations.push(Declaration { - id: DeclarationId(1497), + id: DeclarationId(1499), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1496), + value: DeclarationId(1498), }], }, type_params: vec![], @@ -49339,7 +49391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462), }); declarations.push(Declaration { - id: DeclarationId(1498), + id: DeclarationId(1500), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49359,7 +49411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184), }); declarations.push(Declaration { - id: DeclarationId(1499), + id: DeclarationId(1501), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -49373,7 +49425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111), }); declarations.push(Declaration { - id: DeclarationId(1500), + id: DeclarationId(1502), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49393,7 +49445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157), }); declarations.push(Declaration { - id: DeclarationId(1501), + id: DeclarationId(1503), name: None, connective: TypeConnective::Conj { children: vec![ @@ -49403,7 +49455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "tail".to_string(), - ty: DeclarationId(1500), + ty: DeclarationId(1502), }, ], }, @@ -49418,7 +49470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159), }); declarations.push(Declaration { - id: DeclarationId(1502), + id: DeclarationId(1504), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49438,7 +49490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490), }); declarations.push(Declaration { - id: DeclarationId(1503), + id: DeclarationId(1505), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49458,7 +49510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583), }); declarations.push(Declaration { - id: DeclarationId(1504), + id: DeclarationId(1506), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -49475,7 +49527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(1505), + id: DeclarationId(1507), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -49495,7 +49547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943), }); declarations.push(Declaration { - id: DeclarationId(1506), + id: DeclarationId(1508), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -49515,7 +49567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026), }); declarations.push(Declaration { - id: DeclarationId(1507), + id: DeclarationId(1509), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -49535,10 +49587,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058), }); declarations.push(Declaration { - id: DeclarationId(1508), + id: DeclarationId(1510), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1507), + DeclarationId(1509), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -49552,7 +49604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(1509), + id: DeclarationId(1511), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49572,7 +49624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206), }); declarations.push(Declaration { - id: DeclarationId(1510), + id: DeclarationId(1512), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -49592,10 +49644,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238), }); declarations.push(Declaration { - id: DeclarationId(1511), + id: DeclarationId(1513), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1510), + DeclarationId(1512), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -49609,7 +49661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(1512), + id: DeclarationId(1514), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49629,7 +49681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289), }); declarations.push(Declaration { - id: DeclarationId(1513), + id: DeclarationId(1515), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(167), @@ -49646,7 +49698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(1514), + id: DeclarationId(1516), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -49663,7 +49715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(1515), + id: DeclarationId(1517), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -49680,7 +49732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(1516), + id: DeclarationId(1518), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49700,7 +49752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 37237, 37258), }); declarations.push(Declaration { - id: DeclarationId(1517), + id: DeclarationId(1519), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49720,7 +49772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 37264, 37295), }); declarations.push(Declaration { - id: DeclarationId(1518), + id: DeclarationId(1520), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49739,7 +49791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561), }); declarations.push(Declaration { - id: DeclarationId(1519), + id: DeclarationId(1521), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49758,7 +49810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595), }); declarations.push(Declaration { - id: DeclarationId(1520), + id: DeclarationId(1522), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49778,7 +49830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645), }); declarations.push(Declaration { - id: DeclarationId(1521), + id: DeclarationId(1523), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49798,12 +49850,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084), }); declarations.push(Declaration { - id: DeclarationId(1522), + id: DeclarationId(1524), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1521), + ty: DeclarationId(1523), }], }, type_params: vec![], @@ -49817,7 +49869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086), }); declarations.push(Declaration { - id: DeclarationId(1523), + id: DeclarationId(1525), name: None, connective: TypeConnective::Conj { children: vec![ @@ -49842,7 +49894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147), }); declarations.push(Declaration { - id: DeclarationId(1524), + id: DeclarationId(1526), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49861,7 +49913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555), }); declarations.push(Declaration { - id: DeclarationId(1525), + id: DeclarationId(1527), name: None, connective: TypeConnective::Conj { children: vec![ @@ -49890,7 +49942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630), }); declarations.push(Declaration { - id: DeclarationId(1526), + id: DeclarationId(1528), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -49904,7 +49956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365), }); declarations.push(Declaration { - id: DeclarationId(1527), + id: DeclarationId(1529), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49923,7 +49975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408), }); declarations.push(Declaration { - id: DeclarationId(1528), + id: DeclarationId(1530), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49942,7 +49994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451), }); declarations.push(Declaration { - id: DeclarationId(1529), + id: DeclarationId(1531), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49961,7 +50013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732), }); declarations.push(Declaration { - id: DeclarationId(1530), + id: DeclarationId(1532), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -49975,7 +50027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749), }); declarations.push(Declaration { - id: DeclarationId(1531), + id: DeclarationId(1533), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49994,7 +50046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200), }); declarations.push(Declaration { - id: DeclarationId(1532), + id: DeclarationId(1534), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50013,7 +50065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230), }); declarations.push(Declaration { - id: DeclarationId(1533), + id: DeclarationId(1535), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50027,7 +50079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753), }); declarations.push(Declaration { - id: DeclarationId(1534), + id: DeclarationId(1536), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50046,7 +50098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796), }); declarations.push(Declaration { - id: DeclarationId(1535), + id: DeclarationId(1537), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50065,7 +50117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528), }); declarations.push(Declaration { - id: DeclarationId(1536), + id: DeclarationId(1538), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50084,7 +50136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561), }); declarations.push(Declaration { - id: DeclarationId(1537), + id: DeclarationId(1539), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -50104,12 +50156,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601), }); declarations.push(Declaration { - id: DeclarationId(1538), + id: DeclarationId(1540), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1537), + ty: DeclarationId(1539), }], }, type_params: vec![], @@ -50123,7 +50175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603), }); declarations.push(Declaration { - id: DeclarationId(1539), + id: DeclarationId(1541), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50137,7 +50189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293), }); declarations.push(Declaration { - id: DeclarationId(1540), + id: DeclarationId(1542), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50151,7 +50203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312), }); declarations.push(Declaration { - id: DeclarationId(1541), + id: DeclarationId(1543), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50170,7 +50222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349), }); declarations.push(Declaration { - id: DeclarationId(1542), + id: DeclarationId(1544), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50189,7 +50241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560), }); declarations.push(Declaration { - id: DeclarationId(1543), + id: DeclarationId(1545), name: None, connective: TypeConnective::Conj { children: vec![ @@ -50214,7 +50266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634), }); declarations.push(Declaration { - id: DeclarationId(1544), + id: DeclarationId(1546), name: None, connective: TypeConnective::Conj { children: vec![ @@ -50251,7 +50303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789), }); declarations.push(Declaration { - id: DeclarationId(1545), + id: DeclarationId(1547), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50265,7 +50317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559), }); declarations.push(Declaration { - id: DeclarationId(1546), + id: DeclarationId(1548), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -50285,12 +50337,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617), }); declarations.push(Declaration { - id: DeclarationId(1547), + id: DeclarationId(1549), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "first_breaker".to_string(), - ty: DeclarationId(1546), + ty: DeclarationId(1548), }], }, type_params: vec![], @@ -50304,7 +50356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619), }); declarations.push(Declaration { - id: DeclarationId(1548), + id: DeclarationId(1550), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -50324,12 +50376,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564), }); declarations.push(Declaration { - id: DeclarationId(1549), + id: DeclarationId(1551), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ops".to_string(), - ty: DeclarationId(1548), + ty: DeclarationId(1550), }], }, type_params: vec![], @@ -50343,7 +50395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566), }); declarations.push(Declaration { - id: DeclarationId(1550), + id: DeclarationId(1552), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -50363,12 +50415,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619), }); declarations.push(Declaration { - id: DeclarationId(1551), + id: DeclarationId(1553), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "arms".to_string(), - ty: DeclarationId(1550), + ty: DeclarationId(1552), }], }, type_params: vec![], @@ -50382,7 +50434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621), }); declarations.push(Declaration { - id: DeclarationId(1552), + id: DeclarationId(1554), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50401,7 +50453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661), }); declarations.push(Declaration { - id: DeclarationId(1553), + id: DeclarationId(1555), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -50421,12 +50473,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725), }); declarations.push(Declaration { - id: DeclarationId(1554), + id: DeclarationId(1556), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "branches".to_string(), - ty: DeclarationId(1553), + ty: DeclarationId(1555), }], }, type_params: vec![], @@ -50440,7 +50492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727), }); declarations.push(Declaration { - id: DeclarationId(1555), + id: DeclarationId(1557), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50459,7 +50511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410), }); declarations.push(Declaration { - id: DeclarationId(1556), + id: DeclarationId(1558), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50478,7 +50530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467), }); declarations.push(Declaration { - id: DeclarationId(1557), + id: DeclarationId(1559), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50492,7 +50544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984), }); declarations.push(Declaration { - id: DeclarationId(1558), + id: DeclarationId(1560), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50506,7 +50558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010), }); declarations.push(Declaration { - id: DeclarationId(1559), + id: DeclarationId(1561), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50520,7 +50572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038), }); declarations.push(Declaration { - id: DeclarationId(1560), + id: DeclarationId(1562), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50534,7 +50586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061), }); declarations.push(Declaration { - id: DeclarationId(1561), + id: DeclarationId(1563), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50548,7 +50600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084), }); declarations.push(Declaration { - id: DeclarationId(1562), + id: DeclarationId(1564), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50567,7 +50619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447), }); declarations.push(Declaration { - id: DeclarationId(1563), + id: DeclarationId(1565), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50586,7 +50638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504), }); declarations.push(Declaration { - id: DeclarationId(1564), + id: DeclarationId(1566), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50600,7 +50652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33114, 33120), }); declarations.push(Declaration { - id: DeclarationId(1565), + id: DeclarationId(1567), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50619,7 +50671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33125, 33162), }); declarations.push(Declaration { - id: DeclarationId(1566), + id: DeclarationId(1568), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50638,7 +50690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33167, 33204), }); declarations.push(Declaration { - id: DeclarationId(1567), + id: DeclarationId(1569), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50652,7 +50704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33678, 33697), }); declarations.push(Declaration { - id: DeclarationId(1568), + id: DeclarationId(1570), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50671,7 +50723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33702, 33751), }); declarations.push(Declaration { - id: DeclarationId(1569), + id: DeclarationId(1571), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(699), @@ -50688,7 +50740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18570, 18578), }); declarations.push(Declaration { - id: DeclarationId(1570), + id: DeclarationId(1572), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(743), @@ -50705,7 +50757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18627, 18636), }); declarations.push(Declaration { - id: DeclarationId(1571), + id: DeclarationId(1573), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(743), @@ -50722,7 +50774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18702, 18711), }); declarations.push(Declaration { - id: DeclarationId(1572), + id: DeclarationId(1574), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(716), @@ -50739,7 +50791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19088, 19100), }); declarations.push(Declaration { - id: DeclarationId(1573), + id: DeclarationId(1575), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), @@ -50756,7 +50808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19409, 19424), }); declarations.push(Declaration { - id: DeclarationId(1574), + id: DeclarationId(1576), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -50776,7 +50828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23408, 23429), }); declarations.push(Declaration { - id: DeclarationId(1575), + id: DeclarationId(1577), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -50796,7 +50848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23493, 23514), }); declarations.push(Declaration { - id: DeclarationId(1576), + id: DeclarationId(1578), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50810,7 +50862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489), }); declarations.push(Declaration { - id: DeclarationId(1577), + id: DeclarationId(1579), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50829,7 +50881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513), }); declarations.push(Declaration { - id: DeclarationId(1578), + id: DeclarationId(1580), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50843,7 +50895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528), }); declarations.push(Declaration { - id: DeclarationId(1579), + id: DeclarationId(1581), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(640), @@ -50860,7 +50912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(1580), + id: DeclarationId(1582), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50879,7 +50931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 791, 802), }); declarations.push(Declaration { - id: DeclarationId(1581), + id: DeclarationId(1583), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50898,7 +50950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 807, 820), }); declarations.push(Declaration { - id: DeclarationId(1582), + id: DeclarationId(1584), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50917,7 +50969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 825, 842), }); declarations.push(Declaration { - id: DeclarationId(1583), + id: DeclarationId(1585), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50936,7 +50988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2873, 2893), }); declarations.push(Declaration { - id: DeclarationId(1584), + id: DeclarationId(1586), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50955,7 +51007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2898, 2926), }); declarations.push(Declaration { - id: DeclarationId(1585), + id: DeclarationId(1587), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50974,7 +51026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2931, 2965), }); declarations.push(Declaration { - id: DeclarationId(1586), + id: DeclarationId(1588), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50993,7 +51045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2970, 2999), }); declarations.push(Declaration { - id: DeclarationId(1587), + id: DeclarationId(1589), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51012,7 +51064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3004, 3021), }); declarations.push(Declaration { - id: DeclarationId(1588), + id: DeclarationId(1590), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51026,7 +51078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3625, 3632), }); declarations.push(Declaration { - id: DeclarationId(1589), + id: DeclarationId(1591), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51045,7 +51097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3637, 3687), }); declarations.push(Declaration { - id: DeclarationId(1590), + id: DeclarationId(1592), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51064,7 +51116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5251, 5275), }); declarations.push(Declaration { - id: DeclarationId(1591), + id: DeclarationId(1593), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51078,7 +51130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5300, 5309), }); declarations.push(Declaration { - id: DeclarationId(1592), + id: DeclarationId(1594), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51097,7 +51149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5314, 5350), }); declarations.push(Declaration { - id: DeclarationId(1593), + id: DeclarationId(1595), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51122,7 +51174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5662, 5712), }); declarations.push(Declaration { - id: DeclarationId(1594), + id: DeclarationId(1596), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51136,7 +51188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5717, 5726), }); declarations.push(Declaration { - id: DeclarationId(1595), + id: DeclarationId(1597), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(704), @@ -51156,12 +51208,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6302, 6315), }); declarations.push(Declaration { - id: DeclarationId(1596), + id: DeclarationId(1598), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1595), + ty: DeclarationId(1597), }], }, type_params: vec![], @@ -51175,7 +51227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6290, 6316), }); declarations.push(Declaration { - id: DeclarationId(1597), + id: DeclarationId(1599), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51189,7 +51241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6321, 6338), }); declarations.push(Declaration { - id: DeclarationId(1598), + id: DeclarationId(1600), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51208,7 +51260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6589, 6599), }); declarations.push(Declaration { - id: DeclarationId(1599), + id: DeclarationId(1601), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51222,7 +51274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6604, 6613), }); declarations.push(Declaration { - id: DeclarationId(1600), + id: DeclarationId(1602), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51236,7 +51288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6618, 6627), }); declarations.push(Declaration { - id: DeclarationId(1601), + id: DeclarationId(1603), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51255,7 +51307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7054, 7074), }); declarations.push(Declaration { - id: DeclarationId(1602), + id: DeclarationId(1604), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51274,7 +51326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7079, 7103), }); declarations.push(Declaration { - id: DeclarationId(1603), + id: DeclarationId(1605), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51294,12 +51346,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7115, 7131), }); declarations.push(Declaration { - id: DeclarationId(1604), + id: DeclarationId(1606), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1603), + ty: DeclarationId(1605), }], }, type_params: vec![], @@ -51313,7 +51365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7108, 7132), }); declarations.push(Declaration { - id: DeclarationId(1605), + id: DeclarationId(1607), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51333,12 +51385,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7142, 7158), }); declarations.push(Declaration { - id: DeclarationId(1606), + id: DeclarationId(1608), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1605), + ty: DeclarationId(1607), }], }, type_params: vec![], @@ -51352,7 +51404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7137, 7159), }); declarations.push(Declaration { - id: DeclarationId(1607), + id: DeclarationId(1609), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51372,12 +51424,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7168, 7184), }); declarations.push(Declaration { - id: DeclarationId(1608), + id: DeclarationId(1610), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1607), + ty: DeclarationId(1609), }], }, type_params: vec![], @@ -51391,7 +51443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7164, 7185), }); declarations.push(Declaration { - id: DeclarationId(1609), + id: DeclarationId(1611), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51411,7 +51463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7248, 7264), }); declarations.push(Declaration { - id: DeclarationId(1610), + id: DeclarationId(1612), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51421,7 +51473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), - ty: DeclarationId(1609), + ty: DeclarationId(1611), }, ], }, @@ -51436,7 +51488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7190, 7270), }); declarations.push(Declaration { - id: DeclarationId(1611), + id: DeclarationId(1613), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51455,7 +51507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7429, 7458), }); declarations.push(Declaration { - id: DeclarationId(1612), + id: DeclarationId(1614), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51475,12 +51527,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7493, 7509), }); declarations.push(Declaration { - id: DeclarationId(1613), + id: DeclarationId(1615), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1612), + ty: DeclarationId(1614), }], }, type_params: vec![], @@ -51494,7 +51546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7463, 7511), }); declarations.push(Declaration { - id: DeclarationId(1614), + id: DeclarationId(1616), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51514,12 +51566,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7529, 7545), }); declarations.push(Declaration { - id: DeclarationId(1615), + id: DeclarationId(1617), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1614), + ty: DeclarationId(1616), }], }, type_params: vec![], @@ -51533,7 +51585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7516, 7546), }); declarations.push(Declaration { - id: DeclarationId(1616), + id: DeclarationId(1618), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51552,7 +51604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7900), }); declarations.push(Declaration { - id: DeclarationId(1617), + id: DeclarationId(1619), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51571,7 +51623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7905, 7939), }); declarations.push(Declaration { - id: DeclarationId(1618), + id: DeclarationId(1620), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51585,7 +51637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7944, 7951), }); declarations.push(Declaration { - id: DeclarationId(1619), + id: DeclarationId(1621), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51599,7 +51651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7956, 7962), }); declarations.push(Declaration { - id: DeclarationId(1620), + id: DeclarationId(1622), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51618,7 +51670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7967, 7987), }); declarations.push(Declaration { - id: DeclarationId(1621), + id: DeclarationId(1623), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51637,7 +51689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8216, 8233), }); declarations.push(Declaration { - id: DeclarationId(1622), + id: DeclarationId(1624), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51657,12 +51709,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8255, 8270), }); declarations.push(Declaration { - id: DeclarationId(1623), + id: DeclarationId(1625), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "children".to_string(), - ty: DeclarationId(1622), + ty: DeclarationId(1624), }], }, type_params: vec![], @@ -51676,7 +51728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8238, 8272), }); declarations.push(Declaration { - id: DeclarationId(1624), + id: DeclarationId(1626), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51696,12 +51748,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8294, 8309), }); declarations.push(Declaration { - id: DeclarationId(1625), + id: DeclarationId(1627), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "variants".to_string(), - ty: DeclarationId(1624), + ty: DeclarationId(1626), }], }, type_params: vec![], @@ -51715,7 +51767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8277, 8311), }); declarations.push(Declaration { - id: DeclarationId(1626), + id: DeclarationId(1628), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51735,13 +51787,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8338, 8357), }); declarations.push(Declaration { - id: DeclarationId(1627), + id: DeclarationId(1629), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), - ty: DeclarationId(1626), + ty: DeclarationId(1628), }, Field { label: "output".to_string(), @@ -51764,7 +51816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8316, 8413), }); declarations.push(Declaration { - id: DeclarationId(1628), + id: DeclarationId(1630), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51789,7 +51841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8418, 8496), }); declarations.push(Declaration { - id: DeclarationId(1629), + id: DeclarationId(1631), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51809,7 +51861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8564, 8586), }); declarations.push(Declaration { - id: DeclarationId(1630), + id: DeclarationId(1632), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51819,7 +51871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arguments".to_string(), - ty: DeclarationId(1629), + ty: DeclarationId(1631), }, ], }, @@ -51834,7 +51886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8501, 8592), }); declarations.push(Declaration { - id: DeclarationId(1631), + id: DeclarationId(1633), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -51851,7 +51903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8641, 8648), }); declarations.push(Declaration { - id: DeclarationId(1632), + id: DeclarationId(1634), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51871,7 +51923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8693, 8712), }); declarations.push(Declaration { - id: DeclarationId(1633), + id: DeclarationId(1635), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51891,7 +51943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8731, 8753), }); declarations.push(Declaration { - id: DeclarationId(1634), + id: DeclarationId(1636), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(642), @@ -51908,7 +51960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8766, 8780), }); declarations.push(Declaration { - id: DeclarationId(1635), + id: DeclarationId(1637), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(642), @@ -51925,7 +51977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8793, 8807), }); declarations.push(Declaration { - id: DeclarationId(1636), + id: DeclarationId(1638), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(713), @@ -51942,7 +51994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8822, 8832), }); declarations.push(Declaration { - id: DeclarationId(1637), + id: DeclarationId(1639), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(718), @@ -51959,7 +52011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8852, 8867), }); declarations.push(Declaration { - id: DeclarationId(1638), + id: DeclarationId(1640), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51979,7 +52031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9990, 10009), }); declarations.push(Declaration { - id: DeclarationId(1639), + id: DeclarationId(1641), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51993,7 +52045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10290, 10293), }); declarations.push(Declaration { - id: DeclarationId(1640), + id: DeclarationId(1642), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52007,7 +52059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10298, 10301), }); declarations.push(Declaration { - id: DeclarationId(1641), + id: DeclarationId(1643), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52021,7 +52073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10306, 10309), }); declarations.push(Declaration { - id: DeclarationId(1642), + id: DeclarationId(1644), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52035,7 +52087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10314, 10317), }); declarations.push(Declaration { - id: DeclarationId(1643), + id: DeclarationId(1645), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52049,7 +52101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10441, 10443), }); declarations.push(Declaration { - id: DeclarationId(1644), + id: DeclarationId(1646), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52063,7 +52115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10448, 10450), }); declarations.push(Declaration { - id: DeclarationId(1645), + id: DeclarationId(1647), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52077,7 +52129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10455, 10457), }); declarations.push(Declaration { - id: DeclarationId(1646), + id: DeclarationId(1648), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52091,7 +52143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10462, 10464), }); declarations.push(Declaration { - id: DeclarationId(1647), + id: DeclarationId(1649), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52105,7 +52157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10469, 10471), }); declarations.push(Declaration { - id: DeclarationId(1648), + id: DeclarationId(1650), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52119,7 +52171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10476, 10478), }); declarations.push(Declaration { - id: DeclarationId(1649), + id: DeclarationId(1651), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52133,7 +52185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10731, 10734), }); declarations.push(Declaration { - id: DeclarationId(1650), + id: DeclarationId(1652), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52147,7 +52199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10739, 10741), }); declarations.push(Declaration { - id: DeclarationId(1651), + id: DeclarationId(1653), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52166,7 +52218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10977, 11001), }); declarations.push(Declaration { - id: DeclarationId(1652), + id: DeclarationId(1654), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52185,7 +52237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11006, 11030), }); declarations.push(Declaration { - id: DeclarationId(1653), + id: DeclarationId(1655), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52204,7 +52256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11035, 11053), }); declarations.push(Declaration { - id: DeclarationId(1654), + id: DeclarationId(1656), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52223,7 +52275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11240, 11263), }); declarations.push(Declaration { - id: DeclarationId(1655), + id: DeclarationId(1657), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(642), @@ -52240,7 +52292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11328, 11342), }); declarations.push(Declaration { - id: DeclarationId(1656), + id: DeclarationId(1658), name: None, connective: TypeConnective::Conj { children: vec![ @@ -52250,7 +52302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "field_child".to_string(), - ty: DeclarationId(1655), + ty: DeclarationId(1657), }, ], }, @@ -52265,7 +52317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11268, 11348), }); declarations.push(Declaration { - id: DeclarationId(1657), + id: DeclarationId(1659), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52284,7 +52336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11353, 11375), }); declarations.push(Declaration { - id: DeclarationId(1658), + id: DeclarationId(1660), name: None, connective: TypeConnective::Conj { children: vec![ @@ -52309,7 +52361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11500, 11552), }); declarations.push(Declaration { - id: DeclarationId(1659), + id: DeclarationId(1661), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52328,7 +52380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11557, 11587), }); declarations.push(Declaration { - id: DeclarationId(1660), + id: DeclarationId(1662), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(725), @@ -52345,7 +52397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11751, 11766), }); declarations.push(Declaration { - id: DeclarationId(1661), + id: DeclarationId(1663), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52365,7 +52417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13742, 13773), }); declarations.push(Declaration { - id: DeclarationId(1662), + id: DeclarationId(1664), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(644), @@ -52385,7 +52437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13797, 13827), }); declarations.push(Declaration { - id: DeclarationId(1663), + id: DeclarationId(1665), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52404,7 +52456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14450, 14479), }); declarations.push(Declaration { - id: DeclarationId(1664), + id: DeclarationId(1666), name: None, connective: TypeConnective::Conj { children: vec![ @@ -52429,7 +52481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14484, 14531), }); declarations.push(Declaration { - id: DeclarationId(1665), + id: DeclarationId(1667), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), @@ -52446,7 +52498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14800, 14815), }); declarations.push(Declaration { - id: DeclarationId(1666), + id: DeclarationId(1668), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52466,7 +52518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14889, 14901), }); declarations.push(Declaration { - id: DeclarationId(1667), + id: DeclarationId(1669), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52480,7 +52532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15142, 15151), }); declarations.push(Declaration { - id: DeclarationId(1668), + id: DeclarationId(1670), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52500,7 +52552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15209, 15225), }); declarations.push(Declaration { - id: DeclarationId(1669), + id: DeclarationId(1671), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(738), @@ -52517,7 +52569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15289, 15313), }); declarations.push(Declaration { - id: DeclarationId(1670), + id: DeclarationId(1672), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52531,7 +52583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15727, 15739), }); declarations.push(Declaration { - id: DeclarationId(1671), + id: DeclarationId(1673), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52551,7 +52603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15817, 15829), }); declarations.push(Declaration { - id: DeclarationId(1672), + id: DeclarationId(1674), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), @@ -52568,7 +52620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15867, 15882), }); declarations.push(Declaration { - id: DeclarationId(1673), + id: DeclarationId(1675), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(741), @@ -52585,7 +52637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15905, 15927), }); declarations.push(Declaration { - id: DeclarationId(1674), + id: DeclarationId(1676), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52604,7 +52656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16019, 16035), }); declarations.push(Declaration { - id: DeclarationId(1675), + id: DeclarationId(1677), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52623,7 +52675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16040, 16064), }); declarations.push(Declaration { - id: DeclarationId(1676), + id: DeclarationId(1678), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52642,7 +52694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16069, 16087), }); declarations.push(Declaration { - id: DeclarationId(1677), + id: DeclarationId(1679), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52661,7 +52713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16092, 16106), }); declarations.push(Declaration { - id: DeclarationId(1678), + id: DeclarationId(1680), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52680,7 +52732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16111, 16125), }); declarations.push(Declaration { - id: DeclarationId(1679), + id: DeclarationId(1681), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52700,7 +52752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16154, 16171), }); declarations.push(Declaration { - id: DeclarationId(1680), + id: DeclarationId(1682), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52720,7 +52772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16181, 16195), }); declarations.push(Declaration { - id: DeclarationId(1681), + id: DeclarationId(1683), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52740,7 +52792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16205, 16218), }); declarations.push(Declaration { - id: DeclarationId(1682), + id: DeclarationId(1684), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52760,7 +52812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16231, 16244), }); declarations.push(Declaration { - id: DeclarationId(1683), + id: DeclarationId(1685), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52779,7 +52831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21450, 21468), }); declarations.push(Declaration { - id: DeclarationId(1684), + id: DeclarationId(1686), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52793,7 +52845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21473, 21479), }); declarations.push(Declaration { - id: DeclarationId(1685), + id: DeclarationId(1687), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52813,12 +52865,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21512, 21536), }); declarations.push(Declaration { - id: DeclarationId(1686), + id: DeclarationId(1688), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "candidates".to_string(), - ty: DeclarationId(1685), + ty: DeclarationId(1687), }], }, type_params: vec![], @@ -52832,7 +52884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21484, 21538), }); declarations.push(Declaration { - id: DeclarationId(1687), + id: DeclarationId(1689), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -52852,7 +52904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9849, 9869), }); declarations.push(Declaration { - id: DeclarationId(1688), + id: DeclarationId(1690), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -52872,7 +52924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9933, 9953), }); declarations.push(Declaration { - id: DeclarationId(1689), + id: DeclarationId(1691), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52892,7 +52944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10021, 10051), }); declarations.push(Declaration { - id: DeclarationId(1690), + id: DeclarationId(1692), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52912,7 +52964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10518, 10536), }); declarations.push(Declaration { - id: DeclarationId(1691), + id: DeclarationId(1693), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52932,7 +52984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10542, 10572), }); declarations.push(Declaration { - id: DeclarationId(1692), + id: DeclarationId(1694), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52952,7 +53004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13069, 13087), }); declarations.push(Declaration { - id: DeclarationId(1693), + id: DeclarationId(1695), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52972,7 +53024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17290, 17320), }); declarations.push(Declaration { - id: DeclarationId(1694), + id: DeclarationId(1696), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52992,7 +53044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17325, 17343), }); declarations.push(Declaration { - id: DeclarationId(1695), + id: DeclarationId(1697), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53012,7 +53064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17594, 17612), }); declarations.push(Declaration { - id: DeclarationId(1696), + id: DeclarationId(1698), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53032,7 +53084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17617, 17635), }); declarations.push(Declaration { - id: DeclarationId(1697), + id: DeclarationId(1699), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53052,7 +53104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18901, 18919), }); declarations.push(Declaration { - id: DeclarationId(1698), + id: DeclarationId(1700), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53072,7 +53124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19172, 19190), }); declarations.push(Declaration { - id: DeclarationId(1699), + id: DeclarationId(1701), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53092,7 +53144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19638, 19656), }); declarations.push(Declaration { - id: DeclarationId(1700), + id: DeclarationId(1702), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53112,7 +53164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21673, 21691), }); declarations.push(Declaration { - id: DeclarationId(1701), + id: DeclarationId(1703), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53132,7 +53184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21721, 21739), }); declarations.push(Declaration { - id: DeclarationId(1702), + id: DeclarationId(1704), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53152,7 +53204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22026, 22044), }); declarations.push(Declaration { - id: DeclarationId(1703), + id: DeclarationId(1705), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53172,7 +53224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22072, 22090), }); declarations.push(Declaration { - id: DeclarationId(1704), + id: DeclarationId(1706), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53192,7 +53244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22450, 22468), }); declarations.push(Declaration { - id: DeclarationId(1705), + id: DeclarationId(1707), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53212,7 +53264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22473, 22491), }); declarations.push(Declaration { - id: DeclarationId(1706), + id: DeclarationId(1708), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53226,7 +53278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4805, 4817), }); declarations.push(Declaration { - id: DeclarationId(1707), + id: DeclarationId(1709), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53240,7 +53292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4822, 4838), }); declarations.push(Declaration { - id: DeclarationId(1708), + id: DeclarationId(1710), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53254,7 +53306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4843, 4857), }); declarations.push(Declaration { - id: DeclarationId(1709), + id: DeclarationId(1711), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53268,7 +53320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5707, 5720), }); declarations.push(Declaration { - id: DeclarationId(1710), + id: DeclarationId(1712), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53282,7 +53334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5725, 5740), }); declarations.push(Declaration { - id: DeclarationId(1711), + id: DeclarationId(1713), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53296,7 +53348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5745, 5761), }); declarations.push(Declaration { - id: DeclarationId(1712), + id: DeclarationId(1714), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53310,7 +53362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5766, 5779), }); declarations.push(Declaration { - id: DeclarationId(1713), + id: DeclarationId(1715), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(757), @@ -53327,7 +53379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6632, 6653), }); declarations.push(Declaration { - id: DeclarationId(1714), + id: DeclarationId(1716), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(758), @@ -53344,7 +53396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6668, 6678), }); declarations.push(Declaration { - id: DeclarationId(1715), + id: DeclarationId(1717), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -53361,7 +53413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6708, 6712), }); declarations.push(Declaration { - id: DeclarationId(1716), + id: DeclarationId(1718), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53375,7 +53427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8181, 8190), }); declarations.push(Declaration { - id: DeclarationId(1717), + id: DeclarationId(1719), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53394,7 +53446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8195, 8241), }); declarations.push(Declaration { - id: DeclarationId(1718), + id: DeclarationId(1720), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53413,7 +53465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8413, 8430), }); declarations.push(Declaration { - id: DeclarationId(1719), + id: DeclarationId(1721), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53432,7 +53484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8435, 8459), }); declarations.push(Declaration { - id: DeclarationId(1720), + id: DeclarationId(1722), name: None, connective: TypeConnective::Conj { children: vec![ @@ -53457,7 +53509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8464, 8526), }); declarations.push(Declaration { - id: DeclarationId(1721), + id: DeclarationId(1723), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -53477,12 +53529,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8543, 8573), }); declarations.push(Declaration { - id: DeclarationId(1722), + id: DeclarationId(1724), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1721), + ty: DeclarationId(1723), }], }, type_params: vec![], @@ -53496,7 +53548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8531, 8574), }); declarations.push(Declaration { - id: DeclarationId(1723), + id: DeclarationId(1725), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -53516,12 +53568,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8587, 8617), }); declarations.push(Declaration { - id: DeclarationId(1724), + id: DeclarationId(1726), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1723), + ty: DeclarationId(1725), }], }, type_params: vec![], @@ -53535,7 +53587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8579, 8618), }); declarations.push(Declaration { - id: DeclarationId(1725), + id: DeclarationId(1727), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53554,7 +53606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8623, 8644), }); declarations.push(Declaration { - id: DeclarationId(1726), + id: DeclarationId(1728), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53573,7 +53625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8649, 8668), }); declarations.push(Declaration { - id: DeclarationId(1727), + id: DeclarationId(1729), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -53593,7 +53645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), }); declarations.push(Declaration { - id: DeclarationId(1728), + id: DeclarationId(1730), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(647)], @@ -53611,7 +53663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(1729), + id: DeclarationId(1731), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(623), @@ -53621,7 +53673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1484), + parameter: DeclarationId(1486), value: DeclarationId(769), }, ], @@ -53637,7 +53689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), }); declarations.push(Declaration { - id: DeclarationId(1730), + id: DeclarationId(1732), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -53657,7 +53709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), }); declarations.push(Declaration { - id: DeclarationId(1731), + id: DeclarationId(1733), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(762), DeclarationId(762)], @@ -53675,7 +53727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1732), + id: DeclarationId(1734), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53689,7 +53741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(773), }, ], @@ -53705,7 +53757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), }); declarations.push(Declaration { - id: DeclarationId(1733), + id: DeclarationId(1735), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(613)], @@ -53723,7 +53775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1734), + id: DeclarationId(1736), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53733,7 +53785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(763), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(790), }, TemplateArgument { @@ -53753,7 +53805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), }); declarations.push(Declaration { - id: DeclarationId(1735), + id: DeclarationId(1737), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(613)], @@ -53771,7 +53823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1736), + id: DeclarationId(1738), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53781,7 +53833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(763), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(790), }, TemplateArgument { @@ -53801,7 +53853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), }); declarations.push(Declaration { - id: DeclarationId(1737), + id: DeclarationId(1739), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53821,7 +53873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), }); declarations.push(Declaration { - id: DeclarationId(1738), + id: DeclarationId(1740), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53841,7 +53893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), }); declarations.push(Declaration { - id: DeclarationId(1739), + id: DeclarationId(1741), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -53861,7 +53913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), }); declarations.push(Declaration { - id: DeclarationId(1740), + id: DeclarationId(1742), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53881,7 +53933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), }); declarations.push(Declaration { - id: DeclarationId(1741), + id: DeclarationId(1743), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53901,7 +53953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), }); declarations.push(Declaration { - id: DeclarationId(1742), + id: DeclarationId(1744), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -53921,7 +53973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), }); declarations.push(Declaration { - id: DeclarationId(1743), + id: DeclarationId(1745), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53941,7 +53993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), }); declarations.push(Declaration { - id: DeclarationId(1744), + id: DeclarationId(1746), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(762)], @@ -53959,7 +54011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1745), + id: DeclarationId(1747), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53973,7 +54025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(790), }, ], @@ -53989,7 +54041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), }); declarations.push(Declaration { - id: DeclarationId(1746), + id: DeclarationId(1748), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -54009,7 +54061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), }); declarations.push(Declaration { - id: DeclarationId(1747), + id: DeclarationId(1749), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -54029,11 +54081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), }); declarations.push(Declaration { - id: DeclarationId(1748), + id: DeclarationId(1750), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1705), DeclarationId(762)], - output: DeclarationId(1705), + inputs: vec![DeclarationId(1707), DeclarationId(762)], + output: DeclarationId(1707), body: ArrowBody::NoBody, }, type_params: vec![], @@ -54047,21 +54099,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1749), + id: DeclarationId(1751), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), arguments: vec![ TemplateArgument { parameter: DeclarationId(614), - value: DeclarationId(1705), + value: DeclarationId(1707), }, TemplateArgument { parameter: DeclarationId(613), value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(793), }, ], @@ -54077,7 +54129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), }); declarations.push(Declaration { - id: DeclarationId(1750), + id: DeclarationId(1752), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54097,7 +54149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529), }); declarations.push(Declaration { - id: DeclarationId(1751), + id: DeclarationId(1753), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(86), @@ -54114,7 +54166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(1752), + id: DeclarationId(1754), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -54131,13 +54183,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(1753), + id: DeclarationId(1755), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1027), + value: DeclarationId(1029), }], }, type_params: vec![], @@ -54151,7 +54203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), }); declarations.push(Declaration { - id: DeclarationId(1754), + id: DeclarationId(1756), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54171,12 +54223,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580), }); declarations.push(Declaration { - id: DeclarationId(1755), + id: DeclarationId(1757), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), - ty: DeclarationId(1754), + ty: DeclarationId(1756), }], }, type_params: vec![], @@ -54190,7 +54242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), }); declarations.push(Declaration { - id: DeclarationId(1756), + id: DeclarationId(1758), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54210,12 +54262,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651), }); declarations.push(Declaration { - id: DeclarationId(1757), + id: DeclarationId(1759), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), - ty: DeclarationId(1756), + ty: DeclarationId(1758), }], }, type_params: vec![], @@ -54229,7 +54281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653), }); declarations.push(Declaration { - id: DeclarationId(1758), + id: DeclarationId(1760), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -54248,7 +54300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3068, 3104), }); declarations.push(Declaration { - id: DeclarationId(1759), + id: DeclarationId(1761), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(99), @@ -54265,7 +54317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3179, 3184), }); declarations.push(Declaration { - id: DeclarationId(1760), + id: DeclarationId(1762), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54279,7 +54331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "is_error".to_string(), - ty: DeclarationId(1759), + ty: DeclarationId(1761), }, ], }, @@ -54294,7 +54346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3109, 3186), }); declarations.push(Declaration { - id: DeclarationId(1761), + id: DeclarationId(1763), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -54313,7 +54365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3633, 3671), }); declarations.push(Declaration { - id: DeclarationId(1762), + id: DeclarationId(1764), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54342,7 +54394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3676, 3739), }); declarations.push(Declaration { - id: DeclarationId(1763), + id: DeclarationId(1765), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54356,7 +54408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4097, 4104), }); declarations.push(Declaration { - id: DeclarationId(1764), + id: DeclarationId(1766), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54370,7 +54422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4109, 4118), }); declarations.push(Declaration { - id: DeclarationId(1765), + id: DeclarationId(1767), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54384,7 +54436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4123, 4135), }); declarations.push(Declaration { - id: DeclarationId(1766), + id: DeclarationId(1768), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54398,7 +54450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4140, 4147), }); declarations.push(Declaration { - id: DeclarationId(1767), + id: DeclarationId(1769), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54412,7 +54464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4152, 4161), }); declarations.push(Declaration { - id: DeclarationId(1768), + id: DeclarationId(1770), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54426,7 +54478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4166, 4173), }); declarations.push(Declaration { - id: DeclarationId(1769), + id: DeclarationId(1771), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54440,7 +54492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4178, 4204), }); declarations.push(Declaration { - id: DeclarationId(1770), + id: DeclarationId(1772), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54460,7 +54512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5538, 5573), }); declarations.push(Declaration { - id: DeclarationId(1771), + id: DeclarationId(1773), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -54477,7 +54529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5652, 5659), }); declarations.push(Declaration { - id: DeclarationId(1772), + id: DeclarationId(1774), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54491,7 +54543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1207, 1220), }); declarations.push(Declaration { - id: DeclarationId(1773), + id: DeclarationId(1775), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54505,7 +54557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1225, 1231), }); declarations.push(Declaration { - id: DeclarationId(1774), + id: DeclarationId(1776), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54519,7 +54571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1236, 1254), }); declarations.push(Declaration { - id: DeclarationId(1775), + id: DeclarationId(1777), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54533,7 +54585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1259, 1277), }); declarations.push(Declaration { - id: DeclarationId(1776), + id: DeclarationId(1778), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54547,7 +54599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1282, 1296), }); declarations.push(Declaration { - id: DeclarationId(1777), + id: DeclarationId(1779), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54561,7 +54613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1578, 1587), }); declarations.push(Declaration { - id: DeclarationId(1778), + id: DeclarationId(1780), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54586,7 +54638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1592, 1669), }); declarations.push(Declaration { - id: DeclarationId(1779), + id: DeclarationId(1781), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54611,7 +54663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1674, 1744), }); declarations.push(Declaration { - id: DeclarationId(1780), + id: DeclarationId(1782), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54625,7 +54677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1984, 1989), }); declarations.push(Declaration { - id: DeclarationId(1781), + id: DeclarationId(1783), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54639,7 +54691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1992, 2000), }); declarations.push(Declaration { - id: DeclarationId(1782), + id: DeclarationId(1784), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54653,7 +54705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2003, 2023), }); declarations.push(Declaration { - id: DeclarationId(1783), + id: DeclarationId(1785), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54667,7 +54719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2283), }); declarations.push(Declaration { - id: DeclarationId(1784), + id: DeclarationId(1786), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54681,7 +54733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2286, 2300), }); declarations.push(Declaration { - id: DeclarationId(1785), + id: DeclarationId(1787), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54695,7 +54747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2555, 2567), }); declarations.push(Declaration { - id: DeclarationId(1786), + id: DeclarationId(1788), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54709,7 +54761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2570, 2580), }); declarations.push(Declaration { - id: DeclarationId(1787), + id: DeclarationId(1789), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54723,7 +54775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2898, 2910), }); declarations.push(Declaration { - id: DeclarationId(1788), + id: DeclarationId(1790), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54737,7 +54789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2913, 2929), }); declarations.push(Declaration { - id: DeclarationId(1789), + id: DeclarationId(1791), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54751,7 +54803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2932, 2943), }); declarations.push(Declaration { - id: DeclarationId(1790), + id: DeclarationId(1792), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(39), @@ -54771,7 +54823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 3588, 3596), }); declarations.push(Declaration { - id: DeclarationId(1791), + id: DeclarationId(1793), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54785,7 +54837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4314, 4321), }); declarations.push(Declaration { - id: DeclarationId(1792), + id: DeclarationId(1794), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54799,7 +54851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4326, 4330), }); declarations.push(Declaration { - id: DeclarationId(1793), + id: DeclarationId(1795), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54819,7 +54871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6578, 6599), }); declarations.push(Declaration { - id: DeclarationId(1794), + id: DeclarationId(1796), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54833,7 +54885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238), }); declarations.push(Declaration { - id: DeclarationId(1795), + id: DeclarationId(1797), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54847,7 +54899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268), }); declarations.push(Declaration { - id: DeclarationId(1796), + id: DeclarationId(1798), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54861,7 +54913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283), }); declarations.push(Declaration { - id: DeclarationId(1797), + id: DeclarationId(1799), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54875,7 +54927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565), }); declarations.push(Declaration { - id: DeclarationId(1798), + id: DeclarationId(1800), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54889,7 +54941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594), }); declarations.push(Declaration { - id: DeclarationId(1799), + id: DeclarationId(1801), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54903,7 +54955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631), }); declarations.push(Declaration { - id: DeclarationId(1800), + id: DeclarationId(1802), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54917,7 +54969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663), }); declarations.push(Declaration { - id: DeclarationId(1801), + id: DeclarationId(1803), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54931,7 +54983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393), }); declarations.push(Declaration { - id: DeclarationId(1802), + id: DeclarationId(1804), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54945,7 +54997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430), }); declarations.push(Declaration { - id: DeclarationId(1803), + id: DeclarationId(1805), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54959,7 +55011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588), }); declarations.push(Declaration { - id: DeclarationId(1804), + id: DeclarationId(1806), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54973,7 +55025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614), }); declarations.push(Declaration { - id: DeclarationId(1805), + id: DeclarationId(1807), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54987,7 +55039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637), }); declarations.push(Declaration { - id: DeclarationId(1806), + id: DeclarationId(1808), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55001,7 +55053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796), }); declarations.push(Declaration { - id: DeclarationId(1807), + id: DeclarationId(1809), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55015,7 +55067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831), }); declarations.push(Declaration { - id: DeclarationId(1808), + id: DeclarationId(1810), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55029,7 +55081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857), }); declarations.push(Declaration { - id: DeclarationId(1809), + id: DeclarationId(1811), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55043,7 +55095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044), }); declarations.push(Declaration { - id: DeclarationId(1810), + id: DeclarationId(1812), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55057,7 +55109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076), }); declarations.push(Declaration { - id: DeclarationId(1811), + id: DeclarationId(1813), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55071,7 +55123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095), }); declarations.push(Declaration { - id: DeclarationId(1812), + id: DeclarationId(1814), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55085,7 +55137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362), }); declarations.push(Declaration { - id: DeclarationId(1813), + id: DeclarationId(1815), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55099,7 +55151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393), }); declarations.push(Declaration { - id: DeclarationId(1814), + id: DeclarationId(1816), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55113,7 +55165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423), }); declarations.push(Declaration { - id: DeclarationId(1815), + id: DeclarationId(1817), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55133,7 +55185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332), }); declarations.push(Declaration { - id: DeclarationId(1816), + id: DeclarationId(1818), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55147,7 +55199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713), }); declarations.push(Declaration { - id: DeclarationId(1817), + id: DeclarationId(1819), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55161,7 +55213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736), }); declarations.push(Declaration { - id: DeclarationId(1818), + id: DeclarationId(1820), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55175,7 +55227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759), }); declarations.push(Declaration { - id: DeclarationId(1819), + id: DeclarationId(1821), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55189,7 +55241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791), }); declarations.push(Declaration { - id: DeclarationId(1820), + id: DeclarationId(1822), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -55206,7 +55258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5361, 5368), }); declarations.push(Declaration { - id: DeclarationId(1821), + id: DeclarationId(1823), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -55223,7 +55275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6292, 6296), }); declarations.push(Declaration { - id: DeclarationId(1822), + id: DeclarationId(1824), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(842), @@ -55240,7 +55292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7350, 7369), }); declarations.push(Declaration { - id: DeclarationId(1823), + id: DeclarationId(1825), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(842), @@ -55257,7 +55309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7915, 7934), }); declarations.push(Declaration { - id: DeclarationId(1824), + id: DeclarationId(1826), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55276,7 +55328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1356, 1388), }); declarations.push(Declaration { - id: DeclarationId(1825), + id: DeclarationId(1827), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55295,7 +55347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1393, 1429), }); declarations.push(Declaration { - id: DeclarationId(1826), + id: DeclarationId(1828), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55314,7 +55366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1434, 1471), }); declarations.push(Declaration { - id: DeclarationId(1827), + id: DeclarationId(1829), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55333,7 +55385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1476, 1502), }); declarations.push(Declaration { - id: DeclarationId(1828), + id: DeclarationId(1830), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55352,7 +55404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1507, 1540), }); declarations.push(Declaration { - id: DeclarationId(1829), + id: DeclarationId(1831), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55366,12 +55418,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1545, 1562), }); declarations.push(Declaration { - id: DeclarationId(1830), + id: DeclarationId(1832), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -55385,7 +55437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1567, 1621), }); declarations.push(Declaration { - id: DeclarationId(1831), + id: DeclarationId(1833), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55399,7 +55451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1626, 1633), }); declarations.push(Declaration { - id: DeclarationId(1832), + id: DeclarationId(1834), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55418,13 +55470,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2165, 2203), }); declarations.push(Declaration { - id: DeclarationId(1833), + id: DeclarationId(1835), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "amount".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, Field { label: "collection".to_string(), @@ -55443,13 +55495,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2208, 2282), }); declarations.push(Declaration { - id: DeclarationId(1834), + id: DeclarationId(1836), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, Field { label: "ring_param".to_string(), @@ -55468,13 +55520,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2287, 2362), }); declarations.push(Declaration { - id: DeclarationId(1835), + id: DeclarationId(1837), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "divisor".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }, Field { label: "ring_param".to_string(), @@ -55493,7 +55545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2367, 2440), }); declarations.push(Declaration { - id: DeclarationId(1836), + id: DeclarationId(1838), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55512,7 +55564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2445, 2482), }); declarations.push(Declaration { - id: DeclarationId(1837), + id: DeclarationId(1839), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55531,7 +55583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2487, 2524), }); declarations.push(Declaration { - id: DeclarationId(1838), + id: DeclarationId(1840), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55550,7 +55602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2529, 2570), }); declarations.push(Declaration { - id: DeclarationId(1839), + id: DeclarationId(1841), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55564,7 +55616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2575, 2591), }); declarations.push(Declaration { - id: DeclarationId(1840), + id: DeclarationId(1842), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55578,12 +55630,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2803, 2813), }); declarations.push(Declaration { - id: DeclarationId(1841), + id: DeclarationId(1843), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -55597,12 +55649,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2818, 2865), }); declarations.push(Declaration { - id: DeclarationId(1842), + id: DeclarationId(1844), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }], }, type_params: vec![], @@ -55616,7 +55668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2870, 2921), }); declarations.push(Declaration { - id: DeclarationId(1843), + id: DeclarationId(1845), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55630,7 +55682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3111, 3115), }); declarations.push(Declaration { - id: DeclarationId(1844), + id: DeclarationId(1846), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55644,7 +55696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3120, 3127), }); declarations.push(Declaration { - id: DeclarationId(1845), + id: DeclarationId(1847), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55658,7 +55710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3132, 3138), }); declarations.push(Declaration { - id: DeclarationId(1846), + id: DeclarationId(1848), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(834), @@ -55675,7 +55727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3441, 3454), }); declarations.push(Declaration { - id: DeclarationId(1847), + id: DeclarationId(1849), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55689,7 +55741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7082, 7093), }); declarations.push(Declaration { - id: DeclarationId(1848), + id: DeclarationId(1850), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55703,7 +55755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7142, 7156), }); declarations.push(Declaration { - id: DeclarationId(1849), + id: DeclarationId(1851), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55717,7 +55769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7221, 7237), }); declarations.push(Declaration { - id: DeclarationId(1850), + id: DeclarationId(1852), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55731,7 +55783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369), }); declarations.push(Declaration { - id: DeclarationId(1851), + id: DeclarationId(1853), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55745,7 +55797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381), }); declarations.push(Declaration { - id: DeclarationId(1852), + id: DeclarationId(1854), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55759,7 +55811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618), }); declarations.push(Declaration { - id: DeclarationId(1853), + id: DeclarationId(1855), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55773,7 +55825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632), }); declarations.push(Declaration { - id: DeclarationId(1854), + id: DeclarationId(1856), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55787,7 +55839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921), }); declarations.push(Declaration { - id: DeclarationId(1855), + id: DeclarationId(1857), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55801,7 +55853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935), }); declarations.push(Declaration { - id: DeclarationId(1856), + id: DeclarationId(1858), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55815,7 +55867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173), }); declarations.push(Declaration { - id: DeclarationId(1857), + id: DeclarationId(1859), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55829,7 +55881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187), }); declarations.push(Declaration { - id: DeclarationId(1858), + id: DeclarationId(1860), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55843,7 +55895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044), }); declarations.push(Declaration { - id: DeclarationId(1859), + id: DeclarationId(1861), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55857,7 +55909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065), }); declarations.push(Declaration { - id: DeclarationId(1860), + id: DeclarationId(1862), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55871,7 +55923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080), }); declarations.push(Declaration { - id: DeclarationId(1861), + id: DeclarationId(1863), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55885,7 +55937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099), }); declarations.push(Declaration { - id: DeclarationId(1862), + id: DeclarationId(1864), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55899,7 +55951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399), }); declarations.push(Declaration { - id: DeclarationId(1863), + id: DeclarationId(1865), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55913,7 +55965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418), }); declarations.push(Declaration { - id: DeclarationId(1864), + id: DeclarationId(1866), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55933,7 +55985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830), }); declarations.push(Declaration { - id: DeclarationId(1865), + id: DeclarationId(1867), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55953,7 +56005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222), }); declarations.push(Declaration { - id: DeclarationId(1866), + id: DeclarationId(1868), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55967,7 +56019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708), }); declarations.push(Declaration { - id: DeclarationId(1867), + id: DeclarationId(1869), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55981,7 +56033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729), }); declarations.push(Declaration { - id: DeclarationId(1868), + id: DeclarationId(1870), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55995,7 +56047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1022, 1036), }); declarations.push(Declaration { - id: DeclarationId(1869), + id: DeclarationId(1871), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56009,7 +56061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1041, 1051), }); declarations.push(Declaration { - id: DeclarationId(1870), + id: DeclarationId(1872), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56023,7 +56075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1056, 1068), }); declarations.push(Declaration { - id: DeclarationId(1871), + id: DeclarationId(1873), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56037,7 +56089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085), }); declarations.push(Declaration { - id: DeclarationId(1872), + id: DeclarationId(1874), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56051,7 +56103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103), }); declarations.push(Declaration { - id: DeclarationId(1873), + id: DeclarationId(1875), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56065,7 +56117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1108, 1120), }); declarations.push(Declaration { - id: DeclarationId(1874), + id: DeclarationId(1876), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56079,7 +56131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148), }); declarations.push(Declaration { - id: DeclarationId(1875), + id: DeclarationId(1877), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56098,7 +56150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384), }); declarations.push(Declaration { - id: DeclarationId(1876), + id: DeclarationId(1878), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56117,7 +56169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430), }); declarations.push(Declaration { - id: DeclarationId(1877), + id: DeclarationId(1879), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56137,7 +56189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905), }); declarations.push(Declaration { - id: DeclarationId(1878), + id: DeclarationId(1880), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56156,7 +56208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058), }); declarations.push(Declaration { - id: DeclarationId(1879), + id: DeclarationId(1881), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56170,7 +56222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367), }); declarations.push(Declaration { - id: DeclarationId(1880), + id: DeclarationId(1882), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56190,7 +56242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649), }); declarations.push(Declaration { - id: DeclarationId(1881), + id: DeclarationId(1883), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56200,7 +56252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "sites".to_string(), - ty: DeclarationId(1880), + ty: DeclarationId(1882), }, ], }, @@ -56215,7 +56267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651), }); declarations.push(Declaration { - id: DeclarationId(1882), + id: DeclarationId(1884), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56234,7 +56286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995), }); declarations.push(Declaration { - id: DeclarationId(1883), + id: DeclarationId(1885), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56253,7 +56305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449), }); declarations.push(Declaration { - id: DeclarationId(1884), + id: DeclarationId(1886), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56267,7 +56319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810), }); declarations.push(Declaration { - id: DeclarationId(1885), + id: DeclarationId(1887), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56296,7 +56348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258), }); declarations.push(Declaration { - id: DeclarationId(1886), + id: DeclarationId(1888), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56316,7 +56368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4196, 4216), }); declarations.push(Declaration { - id: DeclarationId(1887), + id: DeclarationId(1889), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56342,7 +56394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4226, 4250), }); declarations.push(Declaration { - id: DeclarationId(1888), + id: DeclarationId(1890), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56368,7 +56420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4261, 4285), }); declarations.push(Declaration { - id: DeclarationId(1889), + id: DeclarationId(1891), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56394,7 +56446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4291, 4315), }); declarations.push(Declaration { - id: DeclarationId(1890), + id: DeclarationId(1892), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56414,7 +56466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4392, 4412), }); declarations.push(Declaration { - id: DeclarationId(1891), + id: DeclarationId(1893), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56440,7 +56492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4422, 4446), }); declarations.push(Declaration { - id: DeclarationId(1892), + id: DeclarationId(1894), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56466,7 +56518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4457, 4481), }); declarations.push(Declaration { - id: DeclarationId(1893), + id: DeclarationId(1895), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56492,7 +56544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4487, 4511), }); declarations.push(Declaration { - id: DeclarationId(1894), + id: DeclarationId(1896), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56512,7 +56564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4595, 4615), }); declarations.push(Declaration { - id: DeclarationId(1895), + id: DeclarationId(1897), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56538,7 +56590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4626, 4650), }); declarations.push(Declaration { - id: DeclarationId(1896), + id: DeclarationId(1898), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56564,7 +56616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4675, 4699), }); declarations.push(Declaration { - id: DeclarationId(1897), + id: DeclarationId(1899), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56584,7 +56636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4790, 4810), }); declarations.push(Declaration { - id: DeclarationId(1898), + id: DeclarationId(1900), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56610,7 +56662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4821, 4845), }); declarations.push(Declaration { - id: DeclarationId(1899), + id: DeclarationId(1901), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56636,7 +56688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4870, 4894), }); declarations.push(Declaration { - id: DeclarationId(1900), + id: DeclarationId(1902), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56655,7 +56707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1626, 1643), }); declarations.push(Declaration { - id: DeclarationId(1901), + id: DeclarationId(1903), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56680,7 +56732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1648, 1689), }); declarations.push(Declaration { - id: DeclarationId(1902), + id: DeclarationId(1904), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56694,7 +56746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1871, 1883), }); declarations.push(Declaration { - id: DeclarationId(1903), + id: DeclarationId(1905), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56713,7 +56765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1888, 1924), }); declarations.push(Declaration { - id: DeclarationId(1904), + id: DeclarationId(1906), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -56733,13 +56785,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2406, 2422), }); declarations.push(Declaration { - id: DeclarationId(1905), + id: DeclarationId(1907), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1904), + value: DeclarationId(1906), }], }, type_params: vec![], @@ -56753,7 +56805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2401, 2423), }); declarations.push(Declaration { - id: DeclarationId(1906), + id: DeclarationId(1908), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56767,7 +56819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witnesses".to_string(), - ty: DeclarationId(1905), + ty: DeclarationId(1907), }, ], }, @@ -56782,7 +56834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2317, 2429), }); declarations.push(Declaration { - id: DeclarationId(1907), + id: DeclarationId(1909), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56802,7 +56854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2497, 2513), }); declarations.push(Declaration { - id: DeclarationId(1908), + id: DeclarationId(1910), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -56822,13 +56874,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2536, 2552), }); declarations.push(Declaration { - id: DeclarationId(1909), + id: DeclarationId(1911), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1908), + value: DeclarationId(1910), }], }, type_params: vec![], @@ -56842,7 +56894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2531, 2553), }); declarations.push(Declaration { - id: DeclarationId(1910), + id: DeclarationId(1912), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56852,11 +56904,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "violations".to_string(), - ty: DeclarationId(1907), + ty: DeclarationId(1909), }, Field { label: "witnesses".to_string(), - ty: DeclarationId(1909), + ty: DeclarationId(1911), }, ], }, @@ -56871,7 +56923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2434, 2559), }); declarations.push(Declaration { - id: DeclarationId(1911), + id: DeclarationId(1913), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -56891,11 +56943,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3216, 3232), }); declarations.push(Declaration { - id: DeclarationId(1912), + id: DeclarationId(1914), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(743)], - output: DeclarationId(1911), + output: DeclarationId(1913), body: ArrowBody::NoBody, }, type_params: vec![], @@ -56909,7 +56961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3195, 3232), }); declarations.push(Declaration { - id: DeclarationId(1913), + id: DeclarationId(1915), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(871), DeclarationId(871)], @@ -56927,7 +56979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3244, 3275), }); declarations.push(Declaration { - id: DeclarationId(1914), + id: DeclarationId(1916), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(743), DeclarationId(871)], @@ -56945,7 +56997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3316, 3359), }); declarations.push(Declaration { - id: DeclarationId(1915), + id: DeclarationId(1917), name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), @@ -56965,7 +57017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052), }); declarations.push(Declaration { - id: DeclarationId(1916), + id: DeclarationId(1918), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56985,7 +57037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873), }); declarations.push(Declaration { - id: DeclarationId(1917), + id: DeclarationId(1919), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56999,7 +57051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204), }); declarations.push(Declaration { - id: DeclarationId(1918), + id: DeclarationId(1920), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57018,7 +57070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237), }); declarations.push(Declaration { - id: DeclarationId(1919), + id: DeclarationId(1921), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57037,7 +57089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746), }); declarations.push(Declaration { - id: DeclarationId(1920), + id: DeclarationId(1922), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57056,7 +57108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773), }); declarations.push(Declaration { - id: DeclarationId(1921), + id: DeclarationId(1923), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57076,7 +57128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165), }); declarations.push(Declaration { - id: DeclarationId(1922), + id: DeclarationId(1924), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57090,7 +57142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170), }); declarations.push(Declaration { - id: DeclarationId(1923), + id: DeclarationId(1925), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57104,7 +57156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183), }); declarations.push(Declaration { - id: DeclarationId(1924), + id: DeclarationId(1926), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57118,7 +57170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629), }); declarations.push(Declaration { - id: DeclarationId(1925), + id: DeclarationId(1927), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57132,7 +57184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642), }); declarations.push(Declaration { - id: DeclarationId(1926), + id: DeclarationId(1928), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57146,7 +57198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991), }); declarations.push(Declaration { - id: DeclarationId(1927), + id: DeclarationId(1929), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57160,7 +57212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002), }); declarations.push(Declaration { - id: DeclarationId(1928), + id: DeclarationId(1930), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57174,7 +57226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268), }); declarations.push(Declaration { - id: DeclarationId(1929), + id: DeclarationId(1931), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57188,7 +57240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278), }); declarations.push(Declaration { - id: DeclarationId(1930), + id: DeclarationId(1932), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57202,7 +57254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296), }); declarations.push(Declaration { - id: DeclarationId(1931), + id: DeclarationId(1933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57216,7 +57268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651), }); declarations.push(Declaration { - id: DeclarationId(1932), + id: DeclarationId(1934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57230,7 +57282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8203, 8212), }); declarations.push(Declaration { - id: DeclarationId(1933), + id: DeclarationId(1935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57244,7 +57296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8217, 8230), }); declarations.push(Declaration { - id: DeclarationId(1934), + id: DeclarationId(1936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57258,7 +57310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8235, 8243), }); declarations.push(Declaration { - id: DeclarationId(1935), + id: DeclarationId(1937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57272,7 +57324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8248, 8258), }); declarations.push(Declaration { - id: DeclarationId(1936), + id: DeclarationId(1938), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57286,7 +57338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8263, 8273), }); declarations.push(Declaration { - id: DeclarationId(1937), + id: DeclarationId(1939), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57300,7 +57352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8278, 8289), }); declarations.push(Declaration { - id: DeclarationId(1938), + id: DeclarationId(1940), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57314,7 +57366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8294, 8302), }); declarations.push(Declaration { - id: DeclarationId(1939), + id: DeclarationId(1941), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57328,7 +57380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8307, 8314), }); declarations.push(Declaration { - id: DeclarationId(1940), + id: DeclarationId(1942), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57342,7 +57394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8319, 8329), }); declarations.push(Declaration { - id: DeclarationId(1941), + id: DeclarationId(1943), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57356,7 +57408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8334, 8346), }); declarations.push(Declaration { - id: DeclarationId(1942), + id: DeclarationId(1944), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57370,7 +57422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11039, 11065), }); declarations.push(Declaration { - id: DeclarationId(1943), + id: DeclarationId(1945), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57384,7 +57436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11070, 11080), }); declarations.push(Declaration { - id: DeclarationId(1944), + id: DeclarationId(1946), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57398,7 +57450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14808, 14814), }); declarations.push(Declaration { - id: DeclarationId(1945), + id: DeclarationId(1947), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57412,7 +57464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14819, 14830), }); declarations.push(Declaration { - id: DeclarationId(1946), + id: DeclarationId(1948), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57426,7 +57478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15150, 15161), }); declarations.push(Declaration { - id: DeclarationId(1947), + id: DeclarationId(1949), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57440,7 +57492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15166, 15177), }); declarations.push(Declaration { - id: DeclarationId(1948), + id: DeclarationId(1950), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57454,7 +57506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17110, 17121), }); declarations.push(Declaration { - id: DeclarationId(1949), + id: DeclarationId(1951), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57468,7 +57520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17126, 17134), }); declarations.push(Declaration { - id: DeclarationId(1950), + id: DeclarationId(1952), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57487,7 +57539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 18297, 18332), }); declarations.push(Declaration { - id: DeclarationId(1951), + id: DeclarationId(1953), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57512,7 +57564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 18337, 18425), }); declarations.push(Declaration { - id: DeclarationId(1952), + id: DeclarationId(1954), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57532,7 +57584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 2458, 2486), }); declarations.push(Declaration { - id: DeclarationId(1953), + id: DeclarationId(1955), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(833), @@ -57549,7 +57601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20442, 20454), }); declarations.push(Declaration { - id: DeclarationId(1954), + id: DeclarationId(1956), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(836), @@ -57566,7 +57618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21827, 21842), }); declarations.push(Declaration { - id: DeclarationId(1955), + id: DeclarationId(1957), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57586,7 +57638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27734, 27749), }); declarations.push(Declaration { - id: DeclarationId(1956), + id: DeclarationId(1958), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57603,7 +57655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31887, 31891), }); declarations.push(Declaration { - id: DeclarationId(1957), + id: DeclarationId(1959), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57620,7 +57672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 32183, 32187), }); declarations.push(Declaration { - id: DeclarationId(1958), + id: DeclarationId(1960), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57637,7 +57689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33432, 33436), }); declarations.push(Declaration { - id: DeclarationId(1959), + id: DeclarationId(1961), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57654,7 +57706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33907, 33911), }); declarations.push(Declaration { - id: DeclarationId(1960), + id: DeclarationId(1962), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57671,7 +57723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35170, 35174), }); declarations.push(Declaration { - id: DeclarationId(1961), + id: DeclarationId(1963), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57688,7 +57740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35442, 35446), }); declarations.push(Declaration { - id: DeclarationId(1962), + id: DeclarationId(1964), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57702,7 +57754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577), }); declarations.push(Declaration { - id: DeclarationId(1963), + id: DeclarationId(1965), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57716,7 +57768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630), }); declarations.push(Declaration { - id: DeclarationId(1964), + id: DeclarationId(1966), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57730,7 +57782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695), }); declarations.push(Declaration { - id: DeclarationId(1965), + id: DeclarationId(1967), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57744,7 +57796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746), }); declarations.push(Declaration { - id: DeclarationId(1966), + id: DeclarationId(1968), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57758,7 +57810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811), }); declarations.push(Declaration { - id: DeclarationId(1967), + id: DeclarationId(1969), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57783,7 +57835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966), }); declarations.push(Declaration { - id: DeclarationId(1968), + id: DeclarationId(1970), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57802,7 +57854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013), }); declarations.push(Declaration { - id: DeclarationId(1969), + id: DeclarationId(1971), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57827,7 +57879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075), }); declarations.push(Declaration { - id: DeclarationId(1970), + id: DeclarationId(1972), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57841,7 +57893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094), }); declarations.push(Declaration { - id: DeclarationId(1971), + id: DeclarationId(1973), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57855,7 +57907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114), }); declarations.push(Declaration { - id: DeclarationId(1972), + id: DeclarationId(1974), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57869,12 +57921,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24019, 24033), }); declarations.push(Declaration { - id: DeclarationId(1973), + id: DeclarationId(1975), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -57888,17 +57940,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24038, 24085), }); declarations.push(Declaration { - id: DeclarationId(1974), + id: DeclarationId(1976), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "numerator".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, Field { label: "root".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, ], }, @@ -57913,17 +57965,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24090, 24167), }); declarations.push(Declaration { - id: DeclarationId(1975), + id: DeclarationId(1977), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "base".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }, Field { label: "argument".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, ], }, @@ -57938,7 +57990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24172, 24246), }); declarations.push(Declaration { - id: DeclarationId(1976), + id: DeclarationId(1978), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57963,7 +58015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24866, 24922), }); declarations.push(Declaration { - id: DeclarationId(1977), + id: DeclarationId(1979), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57982,7 +58034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24938, 24963), }); declarations.push(Declaration { - id: DeclarationId(1978), + id: DeclarationId(1980), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57996,7 +58048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26612, 26625), }); declarations.push(Declaration { - id: DeclarationId(1979), + id: DeclarationId(1981), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58015,7 +58067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26669, 26701), }); declarations.push(Declaration { - id: DeclarationId(1980), + id: DeclarationId(1982), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58035,12 +58087,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26764, 26780), }); declarations.push(Declaration { - id: DeclarationId(1981), + id: DeclarationId(1983), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "factors".to_string(), - ty: DeclarationId(1980), + ty: DeclarationId(1982), }], }, type_params: vec![], @@ -58054,7 +58106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26740, 26782), }); declarations.push(Declaration { - id: DeclarationId(1982), + id: DeclarationId(1984), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58074,13 +58126,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26844, 26860), }); declarations.push(Declaration { - id: DeclarationId(1983), + id: DeclarationId(1985), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1982), + value: DeclarationId(1984), }], }, type_params: vec![], @@ -58094,12 +58146,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26839, 26861), }); declarations.push(Declaration { - id: DeclarationId(1984), + id: DeclarationId(1986), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(1983), + ty: DeclarationId(1985), }], }, type_params: vec![], @@ -58113,7 +58165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26811, 26863), }); declarations.push(Declaration { - id: DeclarationId(1985), + id: DeclarationId(1987), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58133,12 +58185,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27161, 27176), }); declarations.push(Declaration { - id: DeclarationId(1986), + id: DeclarationId(1988), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(1985), + ty: DeclarationId(1987), }], }, type_params: vec![], @@ -58152,7 +58204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27143, 27178), }); declarations.push(Declaration { - id: DeclarationId(1987), + id: DeclarationId(1989), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58166,7 +58218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27261, 27273), }); declarations.push(Declaration { - id: DeclarationId(1988), + id: DeclarationId(1990), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58180,13 +58232,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27343, 27353), }); declarations.push(Declaration { - id: DeclarationId(1989), + id: DeclarationId(1991), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], @@ -58200,13 +58252,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254), }); declarations.push(Declaration { - id: DeclarationId(1990), + id: DeclarationId(1992), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], @@ -58220,7 +58272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434), }); declarations.push(Declaration { - id: DeclarationId(1991), + id: DeclarationId(1993), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -58240,11 +58292,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190), }); declarations.push(Declaration { - id: DeclarationId(1992), + id: DeclarationId(1994), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(743)], - output: DeclarationId(1991), + output: DeclarationId(1993), body: ArrowBody::NoBody, }, type_params: vec![], @@ -58258,7 +58310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190), }); declarations.push(Declaration { - id: DeclarationId(1993), + id: DeclarationId(1995), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -58278,7 +58330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214), }); declarations.push(Declaration { - id: DeclarationId(1994), + id: DeclarationId(1996), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(992), DeclarationId(992)], @@ -58296,7 +58348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238), }); declarations.push(Declaration { - id: DeclarationId(1995), + id: DeclarationId(1997), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(992), DeclarationId(734)], @@ -58314,7 +58366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271), }); declarations.push(Declaration { - id: DeclarationId(1996), + id: DeclarationId(1998), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(992)], @@ -58332,7 +58384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316), }); declarations.push(Declaration { - id: DeclarationId(1997), + id: DeclarationId(1999), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -58352,7 +58404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588), }); declarations.push(Declaration { - id: DeclarationId(1998), + id: DeclarationId(2000), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -58372,7 +58424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641), }); declarations.push(Declaration { - id: DeclarationId(1999), + id: DeclarationId(2001), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58386,7 +58438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536), }); declarations.push(Declaration { - id: DeclarationId(2000), + id: DeclarationId(2002), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58405,7 +58457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551), }); declarations.push(Declaration { - id: DeclarationId(2001), + id: DeclarationId(2003), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58425,7 +58477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196), }); declarations.push(Declaration { - id: DeclarationId(2002), + id: DeclarationId(2004), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1010), @@ -58442,7 +58494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(2003), + id: DeclarationId(2005), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58462,12 +58514,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764), }); declarations.push(Declaration { - id: DeclarationId(2004), + id: DeclarationId(2006), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2003), + ty: DeclarationId(2005), }], }, type_params: vec![], @@ -58481,7 +58533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765), }); declarations.push(Declaration { - id: DeclarationId(2005), + id: DeclarationId(2007), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58501,12 +58553,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795), }); declarations.push(Declaration { - id: DeclarationId(2006), + id: DeclarationId(2008), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2005), + ty: DeclarationId(2007), }], }, type_params: vec![], @@ -58520,7 +58572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796), }); declarations.push(Declaration { - id: DeclarationId(2007), + id: DeclarationId(2009), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58545,7 +58597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113), }); declarations.push(Declaration { - id: DeclarationId(2008), + id: DeclarationId(2010), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58565,7 +58617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182), }); declarations.push(Declaration { - id: DeclarationId(2009), + id: DeclarationId(2011), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58575,7 +58627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2008), + ty: DeclarationId(2010), }, Field { label: "span".to_string(), @@ -58594,7 +58646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211), }); declarations.push(Declaration { - id: DeclarationId(2010), + id: DeclarationId(2012), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58619,7 +58671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280), }); declarations.push(Declaration { - id: DeclarationId(2011), + id: DeclarationId(2013), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58639,13 +58691,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324), }); declarations.push(Declaration { - id: DeclarationId(2012), + id: DeclarationId(2014), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), - ty: DeclarationId(2011), + ty: DeclarationId(2013), }, Field { label: "output".to_string(), @@ -58668,7 +58720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379), }); declarations.push(Declaration { - id: DeclarationId(2013), + id: DeclarationId(2015), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58693,7 +58745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795), }); declarations.push(Declaration { - id: DeclarationId(2014), + id: DeclarationId(2016), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58722,7 +58774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883), }); declarations.push(Declaration { - id: DeclarationId(2015), + id: DeclarationId(2017), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58742,7 +58794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962), }); declarations.push(Declaration { - id: DeclarationId(2016), + id: DeclarationId(2018), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58752,7 +58804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2015), + ty: DeclarationId(2017), }, Field { label: "span".to_string(), @@ -58771,7 +58823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991), }); declarations.push(Declaration { - id: DeclarationId(2017), + id: DeclarationId(2019), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58790,7 +58842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4578, 4586), }); declarations.push(Declaration { - id: DeclarationId(2018), + id: DeclarationId(2020), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58809,7 +58861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4591, 4601), }); declarations.push(Declaration { - id: DeclarationId(2019), + id: DeclarationId(2021), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58828,7 +58880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4606, 4620), }); declarations.push(Declaration { - id: DeclarationId(2020), + id: DeclarationId(2022), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58853,7 +58905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4734, 4785), }); declarations.push(Declaration { - id: DeclarationId(2021), + id: DeclarationId(2023), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58878,7 +58930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4790, 4828), }); declarations.push(Declaration { - id: DeclarationId(2022), + id: DeclarationId(2024), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58898,7 +58950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4856, 4868), }); declarations.push(Declaration { - id: DeclarationId(2023), + id: DeclarationId(2025), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58918,17 +58970,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4890, 4906), }); declarations.push(Declaration { - id: DeclarationId(2024), + id: DeclarationId(2026), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), - ty: DeclarationId(2022), + ty: DeclarationId(2024), }, Field { label: "segment_spans".to_string(), - ty: DeclarationId(2023), + ty: DeclarationId(2025), }, Field { label: "span".to_string(), @@ -58947,7 +58999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4833, 4935), }); declarations.push(Declaration { - id: DeclarationId(2025), + id: DeclarationId(2027), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58967,7 +59019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4980, 4997), }); declarations.push(Declaration { - id: DeclarationId(2026), + id: DeclarationId(2028), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58977,7 +59029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2025), + ty: DeclarationId(2027), }, Field { label: "span".to_string(), @@ -58996,7 +59048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4940, 5026), }); declarations.push(Declaration { - id: DeclarationId(2027), + id: DeclarationId(2029), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59016,7 +59068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5082, 5106), }); declarations.push(Declaration { - id: DeclarationId(2028), + id: DeclarationId(2030), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59026,7 +59078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2027), + ty: DeclarationId(2029), }, Field { label: "span".to_string(), @@ -59045,7 +59097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5031, 5135), }); declarations.push(Declaration { - id: DeclarationId(2029), + id: DeclarationId(2031), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59065,7 +59117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5186, 5203), }); declarations.push(Declaration { - id: DeclarationId(2030), + id: DeclarationId(2032), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59075,7 +59127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2029), + ty: DeclarationId(2031), }, Field { label: "span".to_string(), @@ -59094,7 +59146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5140, 5232), }); declarations.push(Declaration { - id: DeclarationId(2031), + id: DeclarationId(2033), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59114,13 +59166,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5260, 5272), }); declarations.push(Declaration { - id: DeclarationId(2032), + id: DeclarationId(2034), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "params".to_string(), - ty: DeclarationId(2031), + ty: DeclarationId(2033), }, Field { label: "body".to_string(), @@ -59143,7 +59195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5237, 5325), }); declarations.push(Declaration { - id: DeclarationId(2033), + id: DeclarationId(2035), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59176,7 +59228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5330, 5449), }); declarations.push(Declaration { - id: DeclarationId(2034), + id: DeclarationId(2036), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59196,7 +59248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5503, 5524), }); declarations.push(Declaration { - id: DeclarationId(2035), + id: DeclarationId(2037), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59206,7 +59258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arms".to_string(), - ty: DeclarationId(2034), + ty: DeclarationId(2036), }, Field { label: "span".to_string(), @@ -59225,7 +59277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5454, 5553), }); declarations.push(Declaration { - id: DeclarationId(2036), + id: DeclarationId(2038), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59245,13 +59297,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5581, 5605), }); declarations.push(Declaration { - id: DeclarationId(2037), + id: DeclarationId(2039), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "fields".to_string(), - ty: DeclarationId(2036), + ty: DeclarationId(2038), }, Field { label: "span".to_string(), @@ -59270,7 +59322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5558, 5634), }); declarations.push(Declaration { - id: DeclarationId(2038), + id: DeclarationId(2040), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59290,13 +59342,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5662, 5679), }); declarations.push(Declaration { - id: DeclarationId(2039), + id: DeclarationId(2041), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "elements".to_string(), - ty: DeclarationId(2038), + ty: DeclarationId(2040), }, Field { label: "span".to_string(), @@ -59315,7 +59367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5639, 5708), }); declarations.push(Declaration { - id: DeclarationId(2040), + id: DeclarationId(2042), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59335,13 +59387,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 7802, 7823), }); declarations.push(Declaration { - id: DeclarationId(2041), + id: DeclarationId(2043), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "entries".to_string(), - ty: DeclarationId(2040), + ty: DeclarationId(2042), }, Field { label: "span".to_string(), @@ -59360,7 +59412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 7781, 7852), }); declarations.push(Declaration { - id: DeclarationId(2042), + id: DeclarationId(2044), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1003), @@ -59377,7 +59429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8783, 8795), }); declarations.push(Declaration { - id: DeclarationId(2043), + id: DeclarationId(2045), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59387,7 +59439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_ann".to_string(), - ty: DeclarationId(2042), + ty: DeclarationId(2044), }, Field { label: "expr".to_string(), @@ -59406,7 +59458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8742, 8825), }); declarations.push(Declaration { - id: DeclarationId(2044), + id: DeclarationId(2046), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59426,7 +59478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8873, 8885), }); declarations.push(Declaration { - id: DeclarationId(2045), + id: DeclarationId(2047), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59446,7 +59498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8900, 8918), }); declarations.push(Declaration { - id: DeclarationId(2046), + id: DeclarationId(2048), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59456,11 +59508,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2044), + ty: DeclarationId(2046), }, Field { label: "params".to_string(), - ty: DeclarationId(2045), + ty: DeclarationId(2047), }, Field { label: "return_type".to_string(), @@ -59487,7 +59539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8830, 9002), }); declarations.push(Declaration { - id: DeclarationId(2047), + id: DeclarationId(2049), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59507,7 +59559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9062, 9074), }); declarations.push(Declaration { - id: DeclarationId(2048), + id: DeclarationId(2050), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59527,7 +59579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9089, 9107), }); declarations.push(Declaration { - id: DeclarationId(2049), + id: DeclarationId(2051), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59537,11 +59589,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2047), + ty: DeclarationId(2049), }, Field { label: "params".to_string(), - ty: DeclarationId(2048), + ty: DeclarationId(2050), }, Field { label: "return_type".to_string(), @@ -59568,7 +59620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9007, 9195), }); declarations.push(Declaration { - id: DeclarationId(2050), + id: DeclarationId(2052), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1010), @@ -59585,7 +59637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9260, 9272), }); declarations.push(Declaration { - id: DeclarationId(2051), + id: DeclarationId(2053), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59599,7 +59651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "body".to_string(), - ty: DeclarationId(2050), + ty: DeclarationId(2052), }, Field { label: "body_span".to_string(), @@ -59622,7 +59674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9200, 9329), }); declarations.push(Declaration { - id: DeclarationId(2052), + id: DeclarationId(2054), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59642,13 +59694,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9349, 9361), }); declarations.push(Declaration { - id: DeclarationId(2053), + id: DeclarationId(2055), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2052), + ty: DeclarationId(2054), }, Field { label: "span".to_string(), @@ -59667,7 +59719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9334, 9381), }); declarations.push(Declaration { - id: DeclarationId(2054), + id: DeclarationId(2056), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59687,7 +59739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419), }); declarations.push(Declaration { - id: DeclarationId(2055), + id: DeclarationId(2057), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59707,17 +59759,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9433, 9445), }); declarations.push(Declaration { - id: DeclarationId(2056), + id: DeclarationId(2058), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2054), + ty: DeclarationId(2056), }, Field { label: "names".to_string(), - ty: DeclarationId(2055), + ty: DeclarationId(2057), }, Field { label: "span".to_string(), @@ -59736,7 +59788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9386, 9474), }); declarations.push(Declaration { - id: DeclarationId(2057), + id: DeclarationId(2059), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59756,7 +59808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9528, 9540), }); declarations.push(Declaration { - id: DeclarationId(2058), + id: DeclarationId(2060), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59766,7 +59818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2057), + ty: DeclarationId(2059), }, Field { label: "span".to_string(), @@ -59785,7 +59837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9479, 9569), }); declarations.push(Declaration { - id: DeclarationId(2059), + id: DeclarationId(2061), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59805,7 +59857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9625, 9637), }); declarations.push(Declaration { - id: DeclarationId(2060), + id: DeclarationId(2062), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59825,7 +59877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9652, 9670), }); declarations.push(Declaration { - id: DeclarationId(2061), + id: DeclarationId(2063), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59835,11 +59887,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2059), + ty: DeclarationId(2061), }, Field { label: "fields".to_string(), - ty: DeclarationId(2060), + ty: DeclarationId(2062), }, Field { label: "span".to_string(), @@ -59858,7 +59910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9574, 9699), }); declarations.push(Declaration { - id: DeclarationId(2062), + id: DeclarationId(2064), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59878,7 +59930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9752, 9764), }); declarations.push(Declaration { - id: DeclarationId(2063), + id: DeclarationId(2065), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59898,7 +59950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9781, 9801), }); declarations.push(Declaration { - id: DeclarationId(2064), + id: DeclarationId(2066), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1003), @@ -59915,7 +59967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9818, 9830), }); declarations.push(Declaration { - id: DeclarationId(2065), + id: DeclarationId(2067), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59925,15 +59977,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2062), + ty: DeclarationId(2064), }, Field { label: "variants".to_string(), - ty: DeclarationId(2063), + ty: DeclarationId(2065), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(2064), + ty: DeclarationId(2066), }, Field { label: "span".to_string(), @@ -59952,7 +60004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9704, 9859), }); declarations.push(Declaration { - id: DeclarationId(2066), + id: DeclarationId(2068), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59972,7 +60024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9914, 9926), }); declarations.push(Declaration { - id: DeclarationId(2067), + id: DeclarationId(2069), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1010), @@ -59989,7 +60041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9998, 10010), }); declarations.push(Declaration { - id: DeclarationId(2068), + id: DeclarationId(2070), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59999,7 +60051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2066), + ty: DeclarationId(2068), }, Field { label: "nominal_opaque".to_string(), @@ -60011,7 +60063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), - ty: DeclarationId(2067), + ty: DeclarationId(2069), }, Field { label: "span".to_string(), @@ -60030,7 +60082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9864, 10039), }); declarations.push(Declaration { - id: DeclarationId(2069), + id: DeclarationId(2071), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60054,7 +60106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(2070), + id: DeclarationId(2072), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60073,7 +60125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157), }); declarations.push(Declaration { - id: DeclarationId(2071), + id: DeclarationId(2073), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60093,12 +60145,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190), }); declarations.push(Declaration { - id: DeclarationId(2072), + id: DeclarationId(2074), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2071), + ty: DeclarationId(2073), }], }, type_params: vec![], @@ -60112,7 +60164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191), }); declarations.push(Declaration { - id: DeclarationId(2073), + id: DeclarationId(2075), name: None, connective: TypeConnective::Conj { children: vec![ @@ -60137,7 +60189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247), }); declarations.push(Declaration { - id: DeclarationId(2074), + id: DeclarationId(2076), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60156,7 +60208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267), }); declarations.push(Declaration { - id: DeclarationId(2075), + id: DeclarationId(2077), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60175,7 +60227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299), }); declarations.push(Declaration { - id: DeclarationId(2076), + id: DeclarationId(2078), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60201,7 +60253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949), }); declarations.push(Declaration { - id: DeclarationId(2077), + id: DeclarationId(2079), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60218,15 +60270,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 4580, 4595), + span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552), }); declarations.push(Declaration { - id: DeclarationId(2078), + id: DeclarationId(2080), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "input_order".to_string(), - ty: DeclarationId(1022), + ty: DeclarationId(1023), }], }, type_params: vec![], @@ -60237,10 +60289,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5022, 5076), + span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459), }); declarations.push(Declaration { - id: DeclarationId(2079), + id: DeclarationId(2081), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60251,10 +60303,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5341, 5350), + span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733), }); declarations.push(Declaration { - id: DeclarationId(2080), + id: DeclarationId(2082), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60274,7 +60326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617), }); declarations.push(Declaration { - id: DeclarationId(2081), + id: DeclarationId(2083), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60285,7 +60337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), - value: DeclarationId(1024), + value: DeclarationId(1026), }, ], }, @@ -60300,10 +60352,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861), }); declarations.push(Declaration { - id: DeclarationId(2082), + id: DeclarationId(2084), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1028), + DeclarationId(1030), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60317,10 +60369,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345), }); declarations.push(Declaration { - id: DeclarationId(2083), + id: DeclarationId(2085), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1028), + DeclarationId(1030), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60334,10 +60386,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366), }); declarations.push(Declaration { - id: DeclarationId(2084), + id: DeclarationId(2086), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1028), + DeclarationId(1030), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60351,7 +60403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387), }); declarations.push(Declaration { - id: DeclarationId(2085), + id: DeclarationId(2087), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60362,7 +60414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), - value: DeclarationId(1028), + value: DeclarationId(1030), }, ], }, @@ -60377,7 +60429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660), }); declarations.push(Declaration { - id: DeclarationId(2086), + id: DeclarationId(2088), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60388,7 +60440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), - value: DeclarationId(1028), + value: DeclarationId(1030), }, ], }, @@ -60403,10 +60455,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732), }); declarations.push(Declaration { - id: DeclarationId(2087), + id: DeclarationId(2089), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1036), + DeclarationId(1038), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60420,10 +60472,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901), }); declarations.push(Declaration { - id: DeclarationId(2088), + id: DeclarationId(2090), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1037), + DeclarationId(1039), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60437,7 +60489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341), }); declarations.push(Declaration { - id: DeclarationId(2089), + id: DeclarationId(2091), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60451,7 +60503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 667, 673), }); declarations.push(Declaration { - id: DeclarationId(2090), + id: DeclarationId(2092), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60465,7 +60517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 678, 691), }); declarations.push(Declaration { - id: DeclarationId(2091), + id: DeclarationId(2093), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60479,7 +60531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 696, 710), }); declarations.push(Declaration { - id: DeclarationId(2092), + id: DeclarationId(2094), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60498,7 +60550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258), }); declarations.push(Declaration { - id: DeclarationId(2093), + id: DeclarationId(2095), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60517,7 +60569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291), }); declarations.push(Declaration { - id: DeclarationId(2094), + id: DeclarationId(2096), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60536,7 +60588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329), }); declarations.push(Declaration { - id: DeclarationId(2095), + id: DeclarationId(2097), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60555,7 +60607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365), }); declarations.push(Declaration { - id: DeclarationId(2096), + id: DeclarationId(2098), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60574,7 +60626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402), }); declarations.push(Declaration { - id: DeclarationId(2097), + id: DeclarationId(2099), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60588,12 +60640,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416), }); declarations.push(Declaration { - id: DeclarationId(2098), + id: DeclarationId(2100), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -60607,7 +60659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471), }); declarations.push(Declaration { - id: DeclarationId(2099), + id: DeclarationId(2101), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60621,12 +60673,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977), }); declarations.push(Declaration { - id: DeclarationId(2100), + id: DeclarationId(2102), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inner".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }], }, type_params: vec![], @@ -60640,7 +60692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027), }); declarations.push(Declaration { - id: DeclarationId(2101), + id: DeclarationId(2103), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60659,12 +60711,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165), }); declarations.push(Declaration { - id: DeclarationId(2102), + id: DeclarationId(2104), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "amount".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -60678,12 +60730,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214), }); declarations.push(Declaration { - id: DeclarationId(2103), + id: DeclarationId(2105), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -60697,12 +60749,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277), }); declarations.push(Declaration { - id: DeclarationId(2104), + id: DeclarationId(2106), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }], }, type_params: vec![], @@ -60716,7 +60768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338), }); declarations.push(Declaration { - id: DeclarationId(2105), + id: DeclarationId(2107), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60735,7 +60787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376), }); declarations.push(Declaration { - id: DeclarationId(2106), + id: DeclarationId(2108), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60754,7 +60806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411), }); declarations.push(Declaration { - id: DeclarationId(2107), + id: DeclarationId(2109), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60768,13 +60820,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429), }); declarations.push(Declaration { - id: DeclarationId(2108), + id: DeclarationId(2110), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1035), + value: DeclarationId(1037), }], }, type_params: vec![], @@ -60788,13 +60840,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491), }); declarations.push(Declaration { - id: DeclarationId(2109), + id: DeclarationId(2111), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1028), + value: DeclarationId(1030), }], }, type_params: vec![], @@ -60808,7 +60860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722), }); declarations.push(Declaration { - id: DeclarationId(2110), + id: DeclarationId(2112), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60822,7 +60874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), }); declarations.push(Declaration { - id: DeclarationId(2111), + id: DeclarationId(2113), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60836,7 +60888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), }); declarations.push(Declaration { - id: DeclarationId(2112), + id: DeclarationId(2114), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60850,7 +60902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), }); declarations.push(Declaration { - id: DeclarationId(2113), + id: DeclarationId(2115), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60864,7 +60916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), }); declarations.push(Declaration { - id: DeclarationId(2114), + id: DeclarationId(2116), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60878,7 +60930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), }); declarations.push(Declaration { - id: DeclarationId(2115), + id: DeclarationId(2117), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60892,7 +60944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), }); declarations.push(Declaration { - id: DeclarationId(2116), + id: DeclarationId(2118), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60906,7 +60958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 716), }); declarations.push(Declaration { - id: DeclarationId(2117), + id: DeclarationId(2119), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60920,7 +60972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 721, 729), }); declarations.push(Declaration { - id: DeclarationId(2118), + id: DeclarationId(2120), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60934,7 +60986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 734, 742), }); declarations.push(Declaration { - id: DeclarationId(2119), + id: DeclarationId(2121), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60948,7 +61000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 747, 754), }); declarations.push(Declaration { - id: DeclarationId(2120), + id: DeclarationId(2122), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60962,7 +61014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 759, 765), }); declarations.push(Declaration { - id: DeclarationId(2121), + id: DeclarationId(2123), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60976,7 +61028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 770, 777), }); declarations.push(Declaration { - id: DeclarationId(2122), + id: DeclarationId(2124), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60990,7 +61042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 782, 788), }); declarations.push(Declaration { - id: DeclarationId(2123), + id: DeclarationId(2125), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61004,7 +61056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 793, 800), }); declarations.push(Declaration { - id: DeclarationId(2124), + id: DeclarationId(2126), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61023,7 +61075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 805, 818), }); declarations.push(Declaration { - id: DeclarationId(2125), + id: DeclarationId(2127), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61042,7 +61094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 823, 834), }); declarations.push(Declaration { - id: DeclarationId(2126), + id: DeclarationId(2128), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61061,7 +61113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 839, 856), }); declarations.push(Declaration { - id: DeclarationId(2127), + id: DeclarationId(2129), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61075,7 +61127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 861, 863), }); declarations.push(Declaration { - id: DeclarationId(2128), + id: DeclarationId(2130), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61089,7 +61141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 868, 872), }); declarations.push(Declaration { - id: DeclarationId(2129), + id: DeclarationId(2131), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61103,7 +61155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 877, 882), }); declarations.push(Declaration { - id: DeclarationId(2130), + id: DeclarationId(2132), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61117,7 +61169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889), }); declarations.push(Declaration { - id: DeclarationId(2131), + id: DeclarationId(2133), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61131,7 +61183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896), }); declarations.push(Declaration { - id: DeclarationId(2132), + id: DeclarationId(2134), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61145,7 +61197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 903), }); declarations.push(Declaration { - id: DeclarationId(2133), + id: DeclarationId(2135), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61159,7 +61211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 910), }); declarations.push(Declaration { - id: DeclarationId(2134), + id: DeclarationId(2136), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61173,7 +61225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 915, 919), }); declarations.push(Declaration { - id: DeclarationId(2135), + id: DeclarationId(2137), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61187,7 +61239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 924, 929), }); declarations.push(Declaration { - id: DeclarationId(2136), + id: DeclarationId(2138), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61201,7 +61253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 934, 938), }); declarations.push(Declaration { - id: DeclarationId(2137), + id: DeclarationId(2139), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61215,7 +61267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 943, 948), }); declarations.push(Declaration { - id: DeclarationId(2138), + id: DeclarationId(2140), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61229,7 +61281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 953, 959), }); declarations.push(Declaration { - id: DeclarationId(2139), + id: DeclarationId(2141), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61243,7 +61295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 964, 972), }); declarations.push(Declaration { - id: DeclarationId(2140), + id: DeclarationId(2142), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61257,7 +61309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 982), }); declarations.push(Declaration { - id: DeclarationId(2141), + id: DeclarationId(2143), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61271,7 +61323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 987, 992), }); declarations.push(Declaration { - id: DeclarationId(2142), + id: DeclarationId(2144), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61285,7 +61337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 997, 1005), }); declarations.push(Declaration { - id: DeclarationId(2143), + id: DeclarationId(2145), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61299,7 +61351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1019), }); declarations.push(Declaration { - id: DeclarationId(2144), + id: DeclarationId(2146), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61313,7 +61365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1024, 1027), }); declarations.push(Declaration { - id: DeclarationId(2145), + id: DeclarationId(2147), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61327,7 +61379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1032, 1038), }); declarations.push(Declaration { - id: DeclarationId(2146), + id: DeclarationId(2148), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61341,7 +61393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1043, 1049), }); declarations.push(Declaration { - id: DeclarationId(2147), + id: DeclarationId(2149), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61355,7 +61407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1054, 1060), }); declarations.push(Declaration { - id: DeclarationId(2148), + id: DeclarationId(2150), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61369,7 +61421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1065, 1071), }); declarations.push(Declaration { - id: DeclarationId(2149), + id: DeclarationId(2151), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61383,7 +61435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1076, 1084), }); declarations.push(Declaration { - id: DeclarationId(2150), + id: DeclarationId(2152), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61397,7 +61449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1089, 1097), }); declarations.push(Declaration { - id: DeclarationId(2151), + id: DeclarationId(2153), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61411,7 +61463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1102, 1107), }); declarations.push(Declaration { - id: DeclarationId(2152), + id: DeclarationId(2154), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61425,7 +61477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1121), }); declarations.push(Declaration { - id: DeclarationId(2153), + id: DeclarationId(2155), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61439,7 +61491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1126, 1130), }); declarations.push(Declaration { - id: DeclarationId(2154), + id: DeclarationId(2156), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61453,7 +61505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1135, 1143), }); declarations.push(Declaration { - id: DeclarationId(2155), + id: DeclarationId(2157), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61467,7 +61519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1148, 1151), }); declarations.push(Declaration { - id: DeclarationId(2156), + id: DeclarationId(2158), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61481,7 +61533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1722, 1727), }); declarations.push(Declaration { - id: DeclarationId(2157), + id: DeclarationId(2159), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61495,7 +61547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1732, 1736), }); declarations.push(Declaration { - id: DeclarationId(2158), + id: DeclarationId(2160), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61509,7 +61561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1741, 1747), }); declarations.push(Declaration { - id: DeclarationId(2159), + id: DeclarationId(2161), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61523,7 +61575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1752, 1758), }); declarations.push(Declaration { - id: DeclarationId(2160), + id: DeclarationId(2162), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61537,7 +61589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1763, 1767), }); declarations.push(Declaration { - id: DeclarationId(2161), + id: DeclarationId(2163), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61551,7 +61603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1772, 1778), }); declarations.push(Declaration { - id: DeclarationId(2162), + id: DeclarationId(2164), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61565,7 +61617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1783, 1792), }); declarations.push(Declaration { - id: DeclarationId(2163), + id: DeclarationId(2165), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61579,7 +61631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1797, 1805), }); declarations.push(Declaration { - id: DeclarationId(2164), + id: DeclarationId(2166), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61593,7 +61645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1818), }); declarations.push(Declaration { - id: DeclarationId(2165), + id: DeclarationId(2167), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61607,7 +61659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1823, 1830), }); declarations.push(Declaration { - id: DeclarationId(2166), + id: DeclarationId(2168), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61621,7 +61673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1835, 1841), }); declarations.push(Declaration { - id: DeclarationId(2167), + id: DeclarationId(2169), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61635,7 +61687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1846, 1853), }); declarations.push(Declaration { - id: DeclarationId(2168), + id: DeclarationId(2170), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61649,7 +61701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1858, 1864), }); declarations.push(Declaration { - id: DeclarationId(2169), + id: DeclarationId(2171), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61663,7 +61715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1869, 1876), }); declarations.push(Declaration { - id: DeclarationId(2170), + id: DeclarationId(2172), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61677,7 +61729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2316, 2318), }); declarations.push(Declaration { - id: DeclarationId(2171), + id: DeclarationId(2173), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61691,7 +61743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2323, 2327), }); declarations.push(Declaration { - id: DeclarationId(2172), + id: DeclarationId(2174), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61705,7 +61757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2332, 2337), }); declarations.push(Declaration { - id: DeclarationId(2173), + id: DeclarationId(2175), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61719,7 +61771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2344), }); declarations.push(Declaration { - id: DeclarationId(2174), + id: DeclarationId(2176), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61733,7 +61785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2349, 2351), }); declarations.push(Declaration { - id: DeclarationId(2175), + id: DeclarationId(2177), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61747,7 +61799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2356, 2358), }); declarations.push(Declaration { - id: DeclarationId(2176), + id: DeclarationId(2178), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61761,7 +61813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2363, 2365), }); declarations.push(Declaration { - id: DeclarationId(2177), + id: DeclarationId(2179), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61775,7 +61827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2374), }); declarations.push(Declaration { - id: DeclarationId(2178), + id: DeclarationId(2180), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61789,7 +61841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2379, 2384), }); declarations.push(Declaration { - id: DeclarationId(2179), + id: DeclarationId(2181), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61803,7 +61855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2389, 2393), }); declarations.push(Declaration { - id: DeclarationId(2180), + id: DeclarationId(2182), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61817,7 +61869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2398, 2403), }); declarations.push(Declaration { - id: DeclarationId(2181), + id: DeclarationId(2183), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61831,7 +61883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2408, 2414), }); declarations.push(Declaration { - id: DeclarationId(2182), + id: DeclarationId(2184), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61845,7 +61897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2419, 2427), }); declarations.push(Declaration { - id: DeclarationId(2183), + id: DeclarationId(2185), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61859,7 +61911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2432, 2437), }); declarations.push(Declaration { - id: DeclarationId(2184), + id: DeclarationId(2186), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61873,7 +61925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2442, 2447), }); declarations.push(Declaration { - id: DeclarationId(2185), + id: DeclarationId(2187), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61887,7 +61939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2452, 2460), }); declarations.push(Declaration { - id: DeclarationId(2186), + id: DeclarationId(2188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61901,7 +61953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2465, 2474), }); declarations.push(Declaration { - id: DeclarationId(2187), + id: DeclarationId(2189), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61915,7 +61967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2479, 2482), }); declarations.push(Declaration { - id: DeclarationId(2188), + id: DeclarationId(2190), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61929,7 +61981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2493), }); declarations.push(Declaration { - id: DeclarationId(2189), + id: DeclarationId(2191), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61943,7 +61995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2498, 2504), }); declarations.push(Declaration { - id: DeclarationId(2190), + id: DeclarationId(2192), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61957,7 +62009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2509, 2515), }); declarations.push(Declaration { - id: DeclarationId(2191), + id: DeclarationId(2193), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61971,7 +62023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2526), }); declarations.push(Declaration { - id: DeclarationId(2192), + id: DeclarationId(2194), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61985,7 +62037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2531, 2539), }); declarations.push(Declaration { - id: DeclarationId(2193), + id: DeclarationId(2195), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61999,7 +62051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2544, 2552), }); declarations.push(Declaration { - id: DeclarationId(2194), + id: DeclarationId(2196), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62013,7 +62065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2557, 2562), }); declarations.push(Declaration { - id: DeclarationId(2195), + id: DeclarationId(2197), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62027,7 +62079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2567, 2576), }); declarations.push(Declaration { - id: DeclarationId(2196), + id: DeclarationId(2198), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62041,7 +62093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2581, 2585), }); declarations.push(Declaration { - id: DeclarationId(2197), + id: DeclarationId(2199), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62055,7 +62107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2590, 2598), }); declarations.push(Declaration { - id: DeclarationId(2198), + id: DeclarationId(2200), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62075,13 +62127,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14633, 14656), }); declarations.push(Declaration { - id: DeclarationId(2199), + id: DeclarationId(2201), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1068), + value: DeclarationId(1070), }], }, type_params: vec![], @@ -62095,13 +62147,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873), }); declarations.push(Declaration { - id: DeclarationId(2200), + id: DeclarationId(2202), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1070), + value: DeclarationId(1072), }], }, type_params: vec![], @@ -62115,7 +62167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14878, 14898), }); declarations.push(Declaration { - id: DeclarationId(2201), + id: DeclarationId(2203), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62129,7 +62181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494), }); declarations.push(Declaration { - id: DeclarationId(2202), + id: DeclarationId(2204), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62143,7 +62195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509), }); declarations.push(Declaration { - id: DeclarationId(2203), + id: DeclarationId(2205), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62157,7 +62209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526), }); declarations.push(Declaration { - id: DeclarationId(2204), + id: DeclarationId(2206), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62171,7 +62223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543), }); declarations.push(Declaration { - id: DeclarationId(2205), + id: DeclarationId(2207), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62185,7 +62237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561), }); declarations.push(Declaration { - id: DeclarationId(2206), + id: DeclarationId(2208), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62199,7 +62251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578), }); declarations.push(Declaration { - id: DeclarationId(2207), + id: DeclarationId(2209), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62213,7 +62265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606), }); declarations.push(Declaration { - id: DeclarationId(2208), + id: DeclarationId(2210), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62227,7 +62279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021), }); declarations.push(Declaration { - id: DeclarationId(2209), + id: DeclarationId(2211), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62246,7 +62298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042), }); declarations.push(Declaration { - id: DeclarationId(2210), + id: DeclarationId(2212), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62260,7 +62312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709), }); declarations.push(Declaration { - id: DeclarationId(2211), + id: DeclarationId(2213), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62274,7 +62326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724), }); declarations.push(Declaration { - id: DeclarationId(2212), + id: DeclarationId(2214), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62288,7 +62340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552), }); declarations.push(Declaration { - id: DeclarationId(2213), + id: DeclarationId(2215), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62302,7 +62354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570), }); declarations.push(Declaration { - id: DeclarationId(2214), + id: DeclarationId(2216), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62316,7 +62368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583), }); declarations.push(Declaration { - id: DeclarationId(2215), + id: DeclarationId(2217), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62330,12 +62382,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616), }); declarations.push(Declaration { - id: DeclarationId(2216), + id: DeclarationId(2218), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1062), + ty: DeclarationId(1064), }], }, type_params: vec![], @@ -62349,7 +62401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661), }); declarations.push(Declaration { - id: DeclarationId(2217), + id: DeclarationId(2219), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62368,7 +62420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699), }); declarations.push(Declaration { - id: DeclarationId(2218), + id: DeclarationId(2220), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62378,7 +62430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "state".to_string(), - ty: DeclarationId(1063), + ty: DeclarationId(1065), }, ], }, @@ -62393,7 +62445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782), }); declarations.push(Declaration { - id: DeclarationId(2219), + id: DeclarationId(2221), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62412,7 +62464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011), }); declarations.push(Declaration { - id: DeclarationId(2220), + id: DeclarationId(2222), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62441,21 +62493,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107), }); declarations.push(Declaration { - id: DeclarationId(2221), + id: DeclarationId(2223), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "input_sample".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "expected_output".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62470,17 +62522,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244), }); declarations.push(Declaration { - id: DeclarationId(2222), + id: DeclarationId(2224), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "invariant".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62495,7 +62547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548), }); declarations.push(Declaration { - id: DeclarationId(2223), + id: DeclarationId(2225), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62515,7 +62567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360), }); declarations.push(Declaration { - id: DeclarationId(2224), + id: DeclarationId(2226), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62525,7 +62577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2223), + ty: DeclarationId(2225), }, Field { label: "expect_exit_code".to_string(), @@ -62544,7 +62596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394), }); declarations.push(Declaration { - id: DeclarationId(2225), + id: DeclarationId(2227), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62564,7 +62616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106), }); declarations.push(Declaration { - id: DeclarationId(2226), + id: DeclarationId(2228), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62574,7 +62626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2225), + ty: DeclarationId(2227), }, Field { label: "expect_exit_code".to_string(), @@ -62593,21 +62645,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140), }); declarations.push(Declaration { - id: DeclarationId(2227), + id: DeclarationId(2229), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "lens_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "expected_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62622,21 +62674,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560), }); declarations.push(Declaration { - id: DeclarationId(2228), + id: DeclarationId(2230), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "oracle_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62651,17 +62703,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947), }); declarations.push(Declaration { - id: DeclarationId(2229), + id: DeclarationId(2231), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "left_report_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "right_report_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62676,17 +62728,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8514, 8626), }); declarations.push(Declaration { - id: DeclarationId(2230), + id: DeclarationId(2232), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "law".to_string(), - ty: DeclarationId(1064), + ty: DeclarationId(1066), }, Field { label: "lens_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62701,17 +62753,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9222, 9301), }); declarations.push(Declaration { - id: DeclarationId(2231), + id: DeclarationId(2233), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1053), + ty: DeclarationId(1055), }, Field { label: "bound".to_string(), @@ -62730,21 +62782,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9521, 9634), }); declarations.push(Declaration { - id: DeclarationId(2232), + id: DeclarationId(2234), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1053), + ty: DeclarationId(1055), }, Field { label: "subset_predicate".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62759,17 +62811,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9639, 9775), }); declarations.push(Declaration { - id: DeclarationId(2233), + id: DeclarationId(2235), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "compile_target".to_string(), - ty: DeclarationId(1051), + ty: DeclarationId(1053), }, Field { label: "expected".to_string(), - ty: DeclarationId(1052), + ty: DeclarationId(1054), }, ], }, @@ -62784,17 +62836,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9780, 9862), }); declarations.push(Declaration { - id: DeclarationId(2234), + id: DeclarationId(2236), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "ratchet_kind".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62809,13 +62861,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9867, 9953), }); declarations.push(Declaration { - id: DeclarationId(2235), + id: DeclarationId(2237), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1051), + value: DeclarationId(1053), }], }, type_params: vec![], @@ -62829,17 +62881,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10032, 10042), }); declarations.push(Declaration { - id: DeclarationId(2236), + id: DeclarationId(2238), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "generated_paths".to_string(), - ty: DeclarationId(2235), + ty: DeclarationId(2237), }, ], }, @@ -62854,21 +62906,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9958, 10048), }); declarations.push(Declaration { - id: DeclarationId(2237), + id: DeclarationId(2239), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62883,21 +62935,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10990, 11124), }); declarations.push(Declaration { - id: DeclarationId(2238), + id: DeclarationId(2240), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62912,7 +62964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 11763, 11907), }); declarations.push(Declaration { - id: DeclarationId(2239), + id: DeclarationId(2241), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62931,7 +62983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12752, 12806), }); declarations.push(Declaration { - id: DeclarationId(2240), + id: DeclarationId(2242), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62951,13 +63003,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13850, 13873), }); declarations.push(Declaration { - id: DeclarationId(2241), + id: DeclarationId(2243), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1068), + value: DeclarationId(1070), }], }, type_params: vec![], @@ -62971,7 +63023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934), }); declarations.push(Declaration { - id: DeclarationId(2242), + id: DeclarationId(2244), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62991,7 +63043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14190, 14213), }); declarations.push(Declaration { - id: DeclarationId(2243), + id: DeclarationId(2245), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63011,7 +63063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006), }); declarations.push(Declaration { - id: DeclarationId(2244), + id: DeclarationId(2246), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63025,7 +63077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547), }); declarations.push(Declaration { - id: DeclarationId(2245), + id: DeclarationId(2247), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63039,7 +63091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561), }); declarations.push(Declaration { - id: DeclarationId(2246), + id: DeclarationId(2248), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63053,7 +63105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576), }); declarations.push(Declaration { - id: DeclarationId(2247), + id: DeclarationId(2249), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(722), @@ -63070,7 +63122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(2248), + id: DeclarationId(2250), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63084,7 +63136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570), }); declarations.push(Declaration { - id: DeclarationId(2249), + id: DeclarationId(2251), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63098,7 +63150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590), }); declarations.push(Declaration { - id: DeclarationId(2250), + id: DeclarationId(2252), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63112,7 +63164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640), }); declarations.push(Declaration { - id: DeclarationId(2251), + id: DeclarationId(2253), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63126,7 +63178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660), }); declarations.push(Declaration { - id: DeclarationId(2252), + id: DeclarationId(2254), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63140,7 +63192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267), }); declarations.push(Declaration { - id: DeclarationId(2253), + id: DeclarationId(2255), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63154,7 +63206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283), }); declarations.push(Declaration { - id: DeclarationId(2254), + id: DeclarationId(2256), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63168,7 +63220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301), }); declarations.push(Declaration { - id: DeclarationId(2255), + id: DeclarationId(2257), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63182,7 +63234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319), }); declarations.push(Declaration { - id: DeclarationId(2256), + id: DeclarationId(2258), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63196,7 +63248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337), }); declarations.push(Declaration { - id: DeclarationId(2257), + id: DeclarationId(2259), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63210,7 +63262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356), }); declarations.push(Declaration { - id: DeclarationId(2258), + id: DeclarationId(2260), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63224,7 +63276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376), }); declarations.push(Declaration { - id: DeclarationId(2259), + id: DeclarationId(2261), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63238,7 +63290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135), }); declarations.push(Declaration { - id: DeclarationId(2260), + id: DeclarationId(2262), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63252,7 +63304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150), }); declarations.push(Declaration { - id: DeclarationId(2261), + id: DeclarationId(2263), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63266,7 +63318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159), }); declarations.push(Declaration { - id: DeclarationId(2262), + id: DeclarationId(2264), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63276,11 +63328,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1463), + ty: DeclarationId(1465), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1465), + ty: DeclarationId(1467), }, Field { label: "range_min_inclusive".to_string(), @@ -63296,7 +63348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "overflow".to_string(), - ty: DeclarationId(1466), + ty: DeclarationId(1468), }, ], }, @@ -63311,7 +63363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509), }); declarations.push(Declaration { - id: DeclarationId(2263), + id: DeclarationId(2265), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63321,11 +63373,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1464), + ty: DeclarationId(1466), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1465), + ty: DeclarationId(1467), }, Field { label: "is_copy".to_string(), @@ -63344,13 +63396,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696), }); declarations.push(Declaration { - id: DeclarationId(2264), + id: DeclarationId(2266), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1467), + value: DeclarationId(1469), }], }, type_params: vec![], @@ -63478,7 +63530,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(13), Port { id: PortId(13), - state: PortState::Resolved(TypeShape::new(DeclarationId(1689))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1691))), produced_by: Some(NodeId(9)), }, ); @@ -63502,7 +63554,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(16), Port { id: PortId(16), - state: PortState::Resolved(TypeShape::new(DeclarationId(1690))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1692))), produced_by: None, }, ); @@ -63510,7 +63562,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(17), Port { id: PortId(17), - state: PortState::Resolved(TypeShape::new(DeclarationId(1691))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1693))), produced_by: Some(NodeId(11)), }, ); @@ -63798,7 +63850,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(53), Port { id: PortId(53), - state: PortState::Resolved(TypeShape::new(DeclarationId(1692))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), produced_by: None, }, ); @@ -64662,7 +64714,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(161), Port { id: PortId(161), - state: PortState::Resolved(TypeShape::new(DeclarationId(1693))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), produced_by: None, }, ); @@ -64686,7 +64738,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(164), Port { id: PortId(164), - state: PortState::Resolved(TypeShape::new(DeclarationId(1690))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1692))), produced_by: Some(NodeId(113)), }, ); @@ -64702,7 +64754,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(166), Port { id: PortId(166), - state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), produced_by: Some(NodeId(115)), }, ); @@ -64710,7 +64762,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(167), Port { id: PortId(167), - state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1697))), produced_by: None, }, ); @@ -64814,7 +64866,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(180), Port { id: PortId(180), - state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1698))), produced_by: Some(NodeId(128)), }, ); @@ -64958,7 +65010,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(198), Port { id: PortId(198), - state: PortState::Resolved(TypeShape::new(DeclarationId(1697))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1699))), produced_by: None, }, ); @@ -65070,7 +65122,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(212), Port { id: PortId(212), - state: PortState::Resolved(TypeShape::new(DeclarationId(1698))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1700))), produced_by: None, }, ); @@ -65182,7 +65234,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(226), Port { id: PortId(226), - state: PortState::Resolved(TypeShape::new(DeclarationId(1699))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1701))), produced_by: None, }, ); @@ -65798,7 +65850,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(303), Port { id: PortId(303), - state: PortState::Resolved(TypeShape::new(DeclarationId(1700))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1702))), produced_by: None, }, ); @@ -65910,7 +65962,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(317), Port { id: PortId(317), - state: PortState::Resolved(TypeShape::new(DeclarationId(1701))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1703))), produced_by: Some(NodeId(227)), }, ); @@ -65918,7 +65970,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(318), Port { id: PortId(318), - state: PortState::Resolved(TypeShape::new(DeclarationId(1702))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1704))), produced_by: None, }, ); @@ -65974,7 +66026,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(325), Port { id: PortId(325), - state: PortState::Resolved(TypeShape::new(DeclarationId(1703))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1705))), produced_by: Some(NodeId(234)), }, ); @@ -65982,7 +66034,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(326), Port { id: PortId(326), - state: PortState::Resolved(TypeShape::new(DeclarationId(1704))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1706))), produced_by: None, }, ); @@ -65998,7 +66050,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(328), Port { id: PortId(328), - state: PortState::Resolved(TypeShape::new(DeclarationId(1705))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1707))), produced_by: Some(NodeId(237)), }, ); @@ -66014,7 +66066,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(330), Port { id: PortId(330), - state: PortState::Resolved(TypeShape::new(DeclarationId(2243))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2245))), produced_by: Some(NodeId(239)), }, ); diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs index b3c4c1764c7..26b90b2473e 100644 --- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs +++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs @@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { ports: bootstrapped_fixture_without_parse_surface_dag_ports(), diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(), next_node_id: 275, - next_declaration_id: 2182, + next_declaration_id: 2184, next_port_id: 371, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { callable_strategy_variants: CallableStrategyVariants::default(), clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(), optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 2182, + declaration_append_begin_after_bootstrap: 2184, } } @@ -118,21 +118,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(7), - target: TransformTarget::Callable(DeclarationId(1712)), + target: TransformTarget::Callable(DeclarationId(1714)), inputs: vec![PortId(9)], output: PortId(11), span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(8), - target: TransformTarget::Callable(DeclarationId(1714)), + target: TransformTarget::Callable(DeclarationId(1716)), inputs: vec![PortId(11)], output: PortId(12), span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(9), - target: TransformTarget::Callable(DeclarationId(1674)), + target: TransformTarget::Callable(DeclarationId(1676)), inputs: vec![PortId(9), PortId(10), PortId(12)], output: PortId(13), span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446), @@ -148,7 +148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(11), - target: TransformTarget::Callable(DeclarationId(1676)), + target: TransformTarget::Callable(DeclarationId(1678)), inputs: vec![PortId(14), PortId(15), PortId(16)], output: PortId(17), span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633), @@ -164,7 +164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(13), - target: TransformTarget::Callable(DeclarationId(1715)), + target: TransformTarget::Callable(DeclarationId(1717)), inputs: vec![PortId(18)], output: PortId(19), span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), @@ -317,7 +317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(27), - target: TransformTarget::Callable(DeclarationId(1709)), + target: TransformTarget::Callable(DeclarationId(1711)), inputs: vec![PortId(35)], output: PortId(36), span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256), @@ -347,7 +347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(31), - target: TransformTarget::Callable(DeclarationId(1707)), + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(40)], output: PortId(41), span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560), @@ -477,14 +477,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(43), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(54)], output: PortId(55), span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(44), - target: TransformTarget::Callable(DeclarationId(1717)), + target: TransformTarget::Callable(DeclarationId(1719)), inputs: vec![PortId(53), PortId(55)], output: PortId(56), span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), @@ -1194,7 +1194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(91), - target: TransformTarget::Callable(DeclarationId(1719)), + target: TransformTarget::Callable(DeclarationId(1721)), inputs: vec![PortId(136), PortId(137)], output: PortId(138), span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), @@ -1222,7 +1222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(95), - target: TransformTarget::Callable(DeclarationId(1721)), + target: TransformTarget::Callable(DeclarationId(1723)), inputs: vec![PortId(141), PortId(142)], output: PortId(143), span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), @@ -1525,7 +1525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(113), target: TransformTarget::FieldProject { field_label: "rest".to_string(), - field_child: Some(DeclarationId(1488)), + field_child: Some(DeclarationId(1490)), }, inputs: vec![PortId(161)], output: PortId(164), @@ -1533,14 +1533,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(114), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(163), PortId(164)], output: PortId(165), span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(115), - target: TransformTarget::Callable(DeclarationId(1723)), + target: TransformTarget::Callable(DeclarationId(1725)), inputs: vec![PortId(162), PortId(165)], output: PortId(166), span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), @@ -1556,7 +1556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(117), - target: TransformTarget::Callable(DeclarationId(1724)), + target: TransformTarget::Callable(DeclarationId(1726)), inputs: vec![], output: PortId(168), span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), @@ -1624,7 +1624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(125), - target: TransformTarget::Callable(DeclarationId(1725)), + target: TransformTarget::Callable(DeclarationId(1727)), inputs: vec![PortId(174), PortId(176)], output: PortId(177), span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), @@ -1871,7 +1871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(141), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(199)], output: PortId(200), span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983), @@ -1918,7 +1918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(146), - target: TransformTarget::Callable(DeclarationId(1726)), + target: TransformTarget::Callable(DeclarationId(1728)), inputs: vec![PortId(205), PortId(206)], output: PortId(207), span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), @@ -2015,7 +2015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(153), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(213)], output: PortId(214), span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254), @@ -2079,7 +2079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(160), - target: TransformTarget::Callable(DeclarationId(1709)), + target: TransformTarget::Callable(DeclarationId(1711)), inputs: vec![PortId(222)], output: PortId(223), span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416), @@ -2162,7 +2162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(165), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(227)], output: PortId(228), span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720), @@ -2263,7 +2263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(176), - target: TransformTarget::Callable(DeclarationId(1707)), + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(241)], output: PortId(242), span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010), @@ -2735,7 +2735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), - target: TransformTarget::Callable(DeclarationId(1707)), + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(291)], output: PortId(292), span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421), @@ -2830,7 +2830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(216), - target: TransformTarget::Callable(DeclarationId(1727)), + target: TransformTarget::Callable(DeclarationId(1729)), inputs: vec![], output: PortId(305), span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), @@ -2898,7 +2898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(224), - target: TransformTarget::Callable(DeclarationId(1728)), + target: TransformTarget::Callable(DeclarationId(1730)), inputs: vec![PortId(311), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), @@ -2987,7 +2987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(230), - target: TransformTarget::Callable(DeclarationId(1730)), + target: TransformTarget::Callable(DeclarationId(1732)), inputs: vec![PortId(318), PortId(320)], output: PortId(321), span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), @@ -3008,7 +3008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(233), - target: TransformTarget::Callable(DeclarationId(1731)), + target: TransformTarget::Callable(DeclarationId(1733)), inputs: vec![PortId(319), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), @@ -3051,14 +3051,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(236), - target: TransformTarget::Callable(DeclarationId(1732)), + target: TransformTarget::Callable(DeclarationId(1734)), inputs: vec![], output: PortId(327), span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(237), - target: TransformTarget::Callable(DeclarationId(1734)), + target: TransformTarget::Callable(DeclarationId(1736)), inputs: vec![PortId(326), PortId(327)], output: PortId(328), span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), @@ -3076,7 +3076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(239), target: TransformTarget::FieldProject { field_label: "nodes".to_string(), - field_child: Some(DeclarationId(1665)), + field_child: Some(DeclarationId(1667)), }, inputs: vec![PortId(329)], output: PortId(330), @@ -3644,7 +3644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec { { - let mut declarations = Vec::with_capacity(2182); + let mut declarations = Vec::with_capacity(2184); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -16092,11 +16092,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); declarations.push(Declaration { id: DeclarationId(1009), + name: Some("EvalMemoKey".to_string()), + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "program".to_string(), + ty: DeclarationId(642), + }, + Field { + label: "node".to_string(), + ty: DeclarationId(640), + }, + Field { + label: "state_key".to_string(), + ty: DeclarationId(1006), + }, + Field { + label: "strategy".to_string(), + ty: DeclarationId(1007), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153), + }); + declarations.push(Declaration { id: DeclarationId(1010), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1999)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); + declarations.push(Declaration { + id: DeclarationId(1011), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -27024,7 +27076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); + declarations.push(Declaration { id: DeclarationId(1395), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); declarations.push(Declaration { - id: DeclarationId(1394), + id: DeclarationId(1396), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -44162,7 +44214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap panic!("LeftFirst payload must lower as empty Conj, got {other:?}"), } + + let memo_key = dag + .declaration_by_name("EvalMemoKey") + .expect("PR-A.3 EvalMemoKey missing from full bootstrap"); + assert_eq!( + memo_key.span.file, "src/v3/std/runtime.dag", + "EvalMemoKey must live in the single runtime authority module" + ); + assert_eq!( + conj_field_by_id(&dag, eval_memo_key_id, "program"), + find_named(&dag, "DeclarationId"), + "EvalMemoKey.program must name the evaluated program declaration" + ); + assert_eq!( + conj_field_by_id(&dag, eval_memo_key_id, "node"), + find_named(&dag, "NodeId"), + "EvalMemoKey.node must key by structural node identity" + ); + assert_eq!( + conj_field_by_id(&dag, eval_memo_key_id, "state_key"), + eval_state_key_id, + "EvalMemoKey.state_key must use EvalStateKey, not a string or name-only fingerprint" + ); + assert_eq!( + conj_field_by_id(&dag, eval_memo_key_id, "strategy"), + find_named(&dag, "EvalStrategy"), + "EvalMemoKey.strategy must use the closed EvalStrategy carrier" + ); } /// T-Numeric-Construction Slice 2 — `Nat = CommutativeSemiring` resolves From f7b4b08d62c5b479c4bfaa728d627b6d898cf919 Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sat, 2 May 2026 20:03:18 -0400 Subject: [PATCH 3/7] WIP: nimble-tern-266 --- .../r2-pr-b-body-evaluator-eager-baseline.md | 19 +- src/v3/compiler/src/bootstrap_generated.rs | 312 +++++++++--------- ...otstrap_generated_without_parse_surface.rs | 312 +++++++++--------- 3 files changed, 322 insertions(+), 321 deletions(-) diff --git a/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md b/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md index 9c2ba99f746..fa9769be54c 100644 --- a/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md +++ b/docs/briefs/r2-pr-b-body-evaluator-eager-baseline.md @@ -169,20 +169,21 @@ These are **not** in PR-B.0 design lock and **not** in PR-B.1 implementation: ## R3 residual reason -Full evaluator execution cannot ship in R2 because: - -1. **Strategy and memo-key carriers now declared.** `EvalStrategy`, - `InputEvaluationOrder`, `EvalStateKey`, and `EvalMemoKey` live in - `src/v3/std/runtime.dag`. PR-B.1 may read the closed eager strategy and - structural memo-key boundary from the PR-A.3 carrier surface rather than - inventing a local no-memo or string-key convention. -2. **Execution semantics for non-eager strategies undeclared.** `NormalOrder` +The former PR-A.3 carrier absence is closed: `EvalStrategy`, +`InputEvaluationOrder`, `EvalStateKey`, and `EvalMemoKey` live in +`src/v3/std/runtime.dag`, so PR-B.1 may read the closed eager strategy and +structural memo-key boundary rather than inventing a local no-memo or +string-key convention. + +Full evaluator execution still cannot ship in R2 because: + +1. **Execution semantics for non-eager strategies undeclared.** `NormalOrder` has no rule, no thunk capture point, and no TC2 comparison obligation (PR-A.3 audit §EvalStrategy). Until those land, the evaluator cannot honor any inhabitant of `EvalStrategy` other than `ApplicativeOrder / LeftFirst`, which means TC2 cannot strengthen and PR-D harness execution cannot run two strategies for differential receipts. -3. **Witness construction surface unauthored.** The witness half of PR-B has +2. **Witness construction surface unauthored.** The witness half of PR-B has no design lock yet. Even with PR-B.1 landed, witness emission for downstream consumers (R3 lens producers, cross-target reflection consumers) is not in scope here. diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index d90647db0c1..b2d70964a09 100644 --- a/src/v3/compiler/src/bootstrap_generated.rs +++ b/src/v3/compiler/src/bootstrap_generated.rs @@ -24900,8 +24900,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 12177, - 12677, + 12138, + 12638, )), }, type_params: vec![], @@ -24912,7 +24912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 12115, 12677), + span: SourceSpan::new("src/v3/std/induction.dag", 12076, 12638), }); declarations.push(Declaration { id: DeclarationId(944), @@ -24922,8 +24922,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(941), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 13200, - 14612, + 13229, + 14641, )), }, type_params: vec![], @@ -24934,7 +24934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 13120, 14612), + span: SourceSpan::new("src/v3/std/induction.dag", 13149, 14641), }); declarations.push(Declaration { id: DeclarationId(945), @@ -24944,8 +24944,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(941), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 14944, - 16247, + 14973, + 16276, )), }, type_params: vec![], @@ -24956,7 +24956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 14864, 16247), + span: SourceSpan::new("src/v3/std/induction.dag", 14893, 16276), }); declarations.push(Declaration { id: DeclarationId(946), @@ -24966,8 +24966,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(941), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 17356, - 17478, + 17419, + 17541, )), }, type_params: vec![], @@ -24978,7 +24978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 17268, 17478), + span: SourceSpan::new("src/v3/std/induction.dag", 17331, 17541), }); declarations.push(Declaration { id: DeclarationId(947), @@ -24988,8 +24988,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(941), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 18334, - 19680, + 18397, + 19743, )), }, type_params: vec![], @@ -25000,7 +25000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 18226, 19680), + span: SourceSpan::new("src/v3/std/induction.dag", 18289, 19743), }); declarations.push(Declaration { id: DeclarationId(948), @@ -25010,8 +25010,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1955), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 20455, - 21251, + 20518, + 21314, )), }, type_params: vec![], @@ -25022,7 +25022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20382, 21251), + span: SourceSpan::new("src/v3/std/induction.dag", 20445, 21314), }); declarations.push(Declaration { id: DeclarationId(949), @@ -25032,8 +25032,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1956), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 21843, - 22748, + 21906, + 22811, )), }, type_params: vec![], @@ -25044,7 +25044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21764, 22748), + span: SourceSpan::new("src/v3/std/induction.dag", 21827, 22811), }); declarations.push(Declaration { id: DeclarationId(950), @@ -25077,7 +25077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 23991, 24246), + span: SourceSpan::new("src/v3/std/induction.dag", 24054, 24309), }); declarations.push(Declaration { id: DeclarationId(951), @@ -25087,8 +25087,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(950), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 24295, - 24334, + 24358, + 24397, )), }, type_params: vec![], @@ -25099,7 +25099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24248, 24334), + span: SourceSpan::new("src/v3/std/induction.dag", 24311, 24397), }); declarations.push(Declaration { id: DeclarationId(952), @@ -25124,7 +25124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24846, 24963), + span: SourceSpan::new("src/v3/std/induction.dag", 24909, 25026), }); declarations.push(Declaration { id: DeclarationId(953), @@ -25169,7 +25169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26593, 27353), + span: SourceSpan::new("src/v3/std/induction.dag", 26656, 27416), }); declarations.push(Declaration { id: DeclarationId(954), @@ -25179,8 +25179,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 27764, - 27870, + 27827, + 27933, )), }, type_params: vec![], @@ -25191,7 +25191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27714, 27870), + span: SourceSpan::new("src/v3/std/induction.dag", 27777, 27933), }); declarations.push(Declaration { id: DeclarationId(955), @@ -25201,8 +25201,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 28194, - 28447, + 28257, + 28510, )), }, type_params: vec![], @@ -25213,7 +25213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 28145, 28447), + span: SourceSpan::new("src/v3/std/induction.dag", 28208, 28510), }); declarations.push(Declaration { id: DeclarationId(956), @@ -25223,8 +25223,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 28481, - 28498, + 28544, + 28561, )), }, type_params: vec![], @@ -25235,7 +25235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 28449, 28498), + span: SourceSpan::new("src/v3/std/induction.dag", 28512, 28561), }); declarations.push(Declaration { id: DeclarationId(957), @@ -25245,8 +25245,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 28542, - 28626, + 28605, + 28689, )), }, type_params: vec![], @@ -25257,7 +25257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 28499, 28626), + span: SourceSpan::new("src/v3/std/induction.dag", 28562, 28689), }); declarations.push(Declaration { id: DeclarationId(958), @@ -25267,8 +25267,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 28681, - 29080, + 28744, + 29143, )), }, type_params: vec![], @@ -25279,7 +25279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 28627, 29080), + span: SourceSpan::new("src/v3/std/induction.dag", 28690, 29143), }); declarations.push(Declaration { id: DeclarationId(959), @@ -25289,8 +25289,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 29130, - 29404, + 29193, + 29467, )), }, type_params: vec![], @@ -25301,7 +25301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 29081, 29404), + span: SourceSpan::new("src/v3/std/induction.dag", 29144, 29467), }); declarations.push(Declaration { id: DeclarationId(960), @@ -25311,8 +25311,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 29446, - 29479, + 29509, + 29542, )), }, type_params: vec![], @@ -25323,7 +25323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 29405, 29479), + span: SourceSpan::new("src/v3/std/induction.dag", 29468, 29542), }); declarations.push(Declaration { id: DeclarationId(961), @@ -25333,8 +25333,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 29521, - 29554, + 29584, + 29617, )), }, type_params: vec![], @@ -25345,7 +25345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 29480, 29554), + span: SourceSpan::new("src/v3/std/induction.dag", 29543, 29617), }); declarations.push(Declaration { id: DeclarationId(962), @@ -25355,8 +25355,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 29595, - 29645, + 29658, + 29708, )), }, type_params: vec![], @@ -25367,7 +25367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 29555, 29645), + span: SourceSpan::new("src/v3/std/induction.dag", 29618, 29708), }); declarations.push(Declaration { id: DeclarationId(963), @@ -25377,8 +25377,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 29689, - 29807, + 29752, + 29870, )), }, type_params: vec![], @@ -25389,7 +25389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 29647, 29807), + span: SourceSpan::new("src/v3/std/induction.dag", 29710, 29870), }); declarations.push(Declaration { id: DeclarationId(964), @@ -25399,8 +25399,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 29877, - 30053, + 29940, + 30116, )), }, type_params: vec![], @@ -25411,7 +25411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 29809, 30053), + span: SourceSpan::new("src/v3/std/induction.dag", 29872, 30116), }); declarations.push(Declaration { id: DeclarationId(965), @@ -25444,7 +25444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 31210, 31301), + span: SourceSpan::new("src/v3/std/induction.dag", 31273, 31364), }); declarations.push(Declaration { id: DeclarationId(966), @@ -25454,8 +25454,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1958), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 31892, - 32143, + 31955, + 32206, )), }, type_params: vec![], @@ -25466,7 +25466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 31849, 32143), + span: SourceSpan::new("src/v3/std/induction.dag", 31912, 32206), }); declarations.push(Declaration { id: DeclarationId(967), @@ -25476,8 +25476,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1959), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 32188, - 32977, + 32251, + 33040, )), }, type_params: vec![], @@ -25488,7 +25488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 32145, 32977), + span: SourceSpan::new("src/v3/std/induction.dag", 32208, 33040), }); declarations.push(Declaration { id: DeclarationId(968), @@ -25498,8 +25498,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1960), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 33437, - 33560, + 33500, + 33623, )), }, type_params: vec![], @@ -25510,7 +25510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33393, 33560), + span: SourceSpan::new("src/v3/std/induction.dag", 33456, 33623), }); declarations.push(Declaration { id: DeclarationId(969), @@ -25520,8 +25520,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1961), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 33912, - 34957, + 33975, + 35020, )), }, type_params: vec![], @@ -25532,7 +25532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33864, 34957), + span: SourceSpan::new("src/v3/std/induction.dag", 33927, 35020), }); declarations.push(Declaration { id: DeclarationId(970), @@ -25542,8 +25542,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1962), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 35175, - 35290, + 35238, + 35353, )), }, type_params: vec![], @@ -25554,7 +25554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35129, 35290), + span: SourceSpan::new("src/v3/std/induction.dag", 35192, 35353), }); declarations.push(Declaration { id: DeclarationId(971), @@ -25569,8 +25569,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(1963), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 35447, - 35809, + 35510, + 35872, )), }, type_params: vec![], @@ -25581,7 +25581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35376, 35809), + span: SourceSpan::new("src/v3/std/induction.dag", 35439, 35872), }); declarations.push(Declaration { id: DeclarationId(972), @@ -25591,8 +25591,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 35864, - 37901, + 35927, + 37964, )), }, type_params: vec![], @@ -25603,7 +25603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35811, 37901), + span: SourceSpan::new("src/v3/std/induction.dag", 35874, 37964), }); declarations.push(Declaration { id: DeclarationId(973), @@ -25613,8 +25613,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 38254, - 38412, + 38317, + 38475, )), }, type_params: vec![], @@ -25625,7 +25625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 38184, 38412), + span: SourceSpan::new("src/v3/std/induction.dag", 38247, 38475), }); declarations.push(Declaration { id: DeclarationId(974), @@ -25640,8 +25640,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 38911, - 39935, + 38974, + 39998, )), }, type_params: vec![], @@ -25652,7 +25652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 38810, 39935), + span: SourceSpan::new("src/v3/std/induction.dag", 38873, 39998), }); declarations.push(Declaration { id: DeclarationId(975), @@ -25662,8 +25662,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 40268, - 40325, + 40331, + 40388, )), }, type_params: vec![], @@ -25674,7 +25674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 40229, 40325), + span: SourceSpan::new("src/v3/std/induction.dag", 40292, 40388), }); declarations.push(Declaration { id: DeclarationId(976), @@ -25684,8 +25684,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 40368, - 40426, + 40431, + 40489, )), }, type_params: vec![], @@ -25696,7 +25696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 40327, 40426), + span: SourceSpan::new("src/v3/std/induction.dag", 40390, 40489), }); declarations.push(Declaration { id: DeclarationId(977), @@ -25706,8 +25706,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 40526, - 40581, + 40589, + 40644, )), }, type_params: vec![], @@ -25718,7 +25718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 40490, 40581), + span: SourceSpan::new("src/v3/std/induction.dag", 40553, 40644), }); declarations.push(Declaration { id: DeclarationId(978), @@ -25728,8 +25728,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 40778, - 40893, + 40841, + 40956, )), }, type_params: vec![], @@ -25740,7 +25740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 40740, 40893), + span: SourceSpan::new("src/v3/std/induction.dag", 40803, 40956), }); declarations.push(Declaration { id: DeclarationId(979), @@ -25750,8 +25750,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 40973, - 41088, + 41036, + 41151, )), }, type_params: vec![], @@ -25762,7 +25762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 40939, 41088), + span: SourceSpan::new("src/v3/std/induction.dag", 41002, 41151), }); declarations.push(Declaration { id: DeclarationId(980), @@ -25772,8 +25772,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 41255, - 41374, + 41318, + 41437, )), }, type_params: vec![], @@ -25784,7 +25784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 41221, 41374), + span: SourceSpan::new("src/v3/std/induction.dag", 41284, 41437), }); declarations.push(Declaration { id: DeclarationId(981), @@ -25794,8 +25794,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 41539, - 41653, + 41602, + 41716, )), }, type_params: vec![], @@ -25806,7 +25806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 41506, 41653), + span: SourceSpan::new("src/v3/std/induction.dag", 41569, 41716), }); declarations.push(Declaration { id: DeclarationId(982), @@ -25816,8 +25816,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 41770, - 41795, + 41833, + 41858, )), }, type_params: vec![], @@ -25828,7 +25828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 41731, 41795), + span: SourceSpan::new("src/v3/std/induction.dag", 41794, 41858), }); declarations.push(Declaration { id: DeclarationId(983), @@ -25838,8 +25838,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 41830, - 41855, + 41893, + 41918, )), }, type_params: vec![], @@ -25850,7 +25850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 41796, 41855), + span: SourceSpan::new("src/v3/std/induction.dag", 41859, 41918), }); declarations.push(Declaration { id: DeclarationId(984), @@ -25860,8 +25860,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 41937, - 41968, + 42000, + 42031, )), }, type_params: vec![], @@ -25872,7 +25872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 41898, 41968), + span: SourceSpan::new("src/v3/std/induction.dag", 41961, 42031), }); declarations.push(Declaration { id: DeclarationId(985), @@ -25882,8 +25882,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 42204, - 42255, + 42267, + 42318, )), }, type_params: vec![], @@ -25894,7 +25894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 42172, 42255), + span: SourceSpan::new("src/v3/std/induction.dag", 42235, 42318), }); declarations.push(Declaration { id: DeclarationId(986), @@ -25904,8 +25904,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 42346, - 42628, + 42409, + 42691, )), }, type_params: vec![], @@ -25916,7 +25916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 42313, 42628), + span: SourceSpan::new("src/v3/std/induction.dag", 42376, 42691), }); declarations.push(Declaration { id: DeclarationId(987), @@ -25926,8 +25926,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 42731, - 42891, + 42794, + 42954, )), }, type_params: vec![], @@ -25938,7 +25938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 42694, 42891), + span: SourceSpan::new("src/v3/std/induction.dag", 42757, 42954), }); declarations.push(Declaration { id: DeclarationId(988), @@ -25948,8 +25948,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", - 42998, - 43036, + 43061, + 43099, )), }, type_params: vec![], @@ -25960,7 +25960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 42959, 43036), + span: SourceSpan::new("src/v3/std/induction.dag", 43022, 43099), }); declarations.push(Declaration { id: DeclarationId(989), @@ -57598,7 +57598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 20442, 20454), + span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517), }); declarations.push(Declaration { id: DeclarationId(1956), @@ -57615,7 +57615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 21827, 21842), + span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905), }); declarations.push(Declaration { id: DeclarationId(1957), @@ -57635,7 +57635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27734, 27749), + span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812), }); declarations.push(Declaration { id: DeclarationId(1958), @@ -57652,7 +57652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 31887, 31891), + span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954), }); declarations.push(Declaration { id: DeclarationId(1959), @@ -57669,7 +57669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 32183, 32187), + span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250), }); declarations.push(Declaration { id: DeclarationId(1960), @@ -57686,7 +57686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33432, 33436), + span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499), }); declarations.push(Declaration { id: DeclarationId(1961), @@ -57703,7 +57703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 33907, 33911), + span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974), }); declarations.push(Declaration { id: DeclarationId(1962), @@ -57720,7 +57720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35170, 35174), + span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237), }); declarations.push(Declaration { id: DeclarationId(1963), @@ -57737,7 +57737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 35442, 35446), + span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509), }); declarations.push(Declaration { id: DeclarationId(1964), @@ -57918,7 +57918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24019, 24033), + span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096), }); declarations.push(Declaration { id: DeclarationId(1975), @@ -57937,7 +57937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24038, 24085), + span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148), }); declarations.push(Declaration { id: DeclarationId(1976), @@ -57962,7 +57962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24090, 24167), + span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230), }); declarations.push(Declaration { id: DeclarationId(1977), @@ -57987,7 +57987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24172, 24246), + span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309), }); declarations.push(Declaration { id: DeclarationId(1978), @@ -58012,7 +58012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24866, 24922), + span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985), }); declarations.push(Declaration { id: DeclarationId(1979), @@ -58031,7 +58031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 24938, 24963), + span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026), }); declarations.push(Declaration { id: DeclarationId(1980), @@ -58045,7 +58045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26612, 26625), + span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688), }); declarations.push(Declaration { id: DeclarationId(1981), @@ -58064,7 +58064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26669, 26701), + span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764), }); declarations.push(Declaration { id: DeclarationId(1982), @@ -58084,7 +58084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26764, 26780), + span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843), }); declarations.push(Declaration { id: DeclarationId(1983), @@ -58103,7 +58103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26740, 26782), + span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845), }); declarations.push(Declaration { id: DeclarationId(1984), @@ -58123,7 +58123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26844, 26860), + span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923), }); declarations.push(Declaration { id: DeclarationId(1985), @@ -58143,7 +58143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26839, 26861), + span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924), }); declarations.push(Declaration { id: DeclarationId(1986), @@ -58162,7 +58162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26811, 26863), + span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926), }); declarations.push(Declaration { id: DeclarationId(1987), @@ -58182,7 +58182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27161, 27176), + span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239), }); declarations.push(Declaration { id: DeclarationId(1988), @@ -58201,7 +58201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27143, 27178), + span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241), }); declarations.push(Declaration { id: DeclarationId(1989), @@ -58215,7 +58215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27261, 27273), + span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336), }); declarations.push(Declaration { id: DeclarationId(1990), @@ -58229,7 +58229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 27343, 27353), + span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416), }); declarations.push(Declaration { id: DeclarationId(1991), diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs index 26b90b2473e..c909235d68a 100644 --- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs +++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs @@ -24900,8 +24900,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Date: Sat, 2 May 2026 20:10:50 -0400 Subject: [PATCH 4/7] WIP: nimble-tern-266 --- src/v3/compiler/tests/integration/parse_corpus_manifest.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt index c3b876bc165..3511bef2be3 100644 --- a/src/v3/compiler/tests/integration/parse_corpus_manifest.txt +++ b/src/v3/compiler/tests/integration/parse_corpus_manifest.txt @@ -40,7 +40,7 @@ src/v3/std/effects.dag 53 97984 1acdbeaa68acfd2e src/v3/std/emit_model.dag 43 77647 4b063e9a5ddc50a1 src/v3/std/extdeps_bootstrap_fixtures.dag 4 14463 909ca7a1c1705e89 src/v3/std/go_method_template_contracts.dag 5 110898 7eb5c9f1296f4a45 -src/v3/std/induction.dag 56 88794 546f74c63c189c50 +src/v3/std/induction.dag 56 88794 e405e1549cf2fe08 src/v3/std/integer_diagnostic_order.dag 6 8124 5d7b31594a5b3d5c src/v3/std/lens.dag 6 9852 28d5539a5b28716e src/v3/std/list.dag 19 40269 8c648d4a4fd05c21 @@ -49,7 +49,7 @@ src/v3/std/methods.dag 3 1388 48f145b21c115326 src/v3/std/parse_surface.dag 18 99510 b73114d5b178303d src/v3/std/python_method_template_contracts.dag 5 142882 3086daf4cf293650 src/v3/std/resources.dag 5 3632 5303e31e96b01ee5 -src/v3/std/runtime.dag 12 13724 61e250b2c0a425e9 +src/v3/std/runtime.dag 14 16342 4eaaff1aac38d20d src/v3/std/rust_method_template_contracts.dag 5 109753 7b10fcd0d9079900 src/v3/std/services.dag 8 5791 840c901943fce7bf src/v3/std/substrate.dag 63 138927 62c6b3c41f6e06f8 From 948dcb2c7feac08fc3038672d4142dd724c5376e Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sat, 2 May 2026 20:30:14 -0400 Subject: [PATCH 5/7] WIP: nimble-tern-266 --- .../compiler/tests/integration/m2_substrate_inhabitance_test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs index 7f7e73bc9dc..70fc9396e1d 100644 --- a/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs +++ b/src/v3/compiler/tests/integration/m2_substrate_inhabitance_test.rs @@ -3283,7 +3283,7 @@ fn pr_a_2_eval_frame_and_state_stack_carriers_match_pb_runtime_section_3_3() { } #[test] -fn pr_a_3_eval_strategy_carriers_match_eager_baseline_shape() { +fn pr_a_3_strategy_and_memo_key_carriers_match_eager_baseline_shape() { let dag = v3_compiler::generated_full_bootstrap_dag(); let eval_state_key_id = find_named(&dag, "EvalStateKey"); From 538ad964d23960f35bc5d961b4da665e5281c4ee Mon Sep 17 00:00:00 2001 From: Brian Searls Date: Sat, 2 May 2026 22:25:15 -0400 Subject: [PATCH 6/7] WIP: nimble-tern-266 --- src/v3/compiler/src/bootstrap_generated.rs | 6250 +++++++++-------- ...otstrap_generated_without_parse_surface.rs | 5762 +++++++-------- 2 files changed, 6058 insertions(+), 5954 deletions(-) diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index 1a9fb343b6e..b2d70964a09 100644 --- a/src/v3/compiler/src/bootstrap_generated.rs +++ b/src/v3/compiler/src/bootstrap_generated.rs @@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { ports: bootstrapped_fixture_dag_ports(), diagnostics: bootstrapped_fixture_dag_diagnostics(), next_node_id: 275, - next_declaration_id: 2265, + next_declaration_id: 2267, next_port_id: 371, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { callable_strategy_variants: CallableStrategyVariants::default(), clusters: bootstrapped_fixture_dag_clusters(), optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 2265, + declaration_append_begin_after_bootstrap: 2267, } } @@ -118,21 +118,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(7), - target: TransformTarget::Callable(DeclarationId(1727)), + target: TransformTarget::Callable(DeclarationId(1729)), inputs: vec![PortId(9)], output: PortId(11), span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(8), - target: TransformTarget::Callable(DeclarationId(1729)), + target: TransformTarget::Callable(DeclarationId(1731)), inputs: vec![PortId(11)], output: PortId(12), span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(9), - target: TransformTarget::Callable(DeclarationId(1689)), + target: TransformTarget::Callable(DeclarationId(1691)), inputs: vec![PortId(9), PortId(10), PortId(12)], output: PortId(13), span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446), @@ -148,7 +148,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(11), - target: TransformTarget::Callable(DeclarationId(1691)), + target: TransformTarget::Callable(DeclarationId(1693)), inputs: vec![PortId(14), PortId(15), PortId(16)], output: PortId(17), span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633), @@ -164,7 +164,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(13), - target: TransformTarget::Callable(DeclarationId(1730)), + target: TransformTarget::Callable(DeclarationId(1732)), inputs: vec![PortId(18)], output: PortId(19), span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), @@ -317,7 +317,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(27), - target: TransformTarget::Callable(DeclarationId(1724)), + target: TransformTarget::Callable(DeclarationId(1726)), inputs: vec![PortId(35)], output: PortId(36), span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256), @@ -347,7 +347,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(31), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(40)], output: PortId(41), span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560), @@ -477,14 +477,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(43), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(54)], output: PortId(55), span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(44), - target: TransformTarget::Callable(DeclarationId(1732)), + target: TransformTarget::Callable(DeclarationId(1734)), inputs: vec![PortId(53), PortId(55)], output: PortId(56), span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), @@ -1194,7 +1194,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(91), - target: TransformTarget::Callable(DeclarationId(1734)), + target: TransformTarget::Callable(DeclarationId(1736)), inputs: vec![PortId(136), PortId(137)], output: PortId(138), span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), @@ -1222,7 +1222,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(95), - target: TransformTarget::Callable(DeclarationId(1736)), + target: TransformTarget::Callable(DeclarationId(1738)), inputs: vec![PortId(141), PortId(142)], output: PortId(143), span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), @@ -1525,7 +1525,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(113), target: TransformTarget::FieldProject { field_label: "rest".to_string(), - field_child: Some(DeclarationId(1503)), + field_child: Some(DeclarationId(1505)), }, inputs: vec![PortId(161)], output: PortId(164), @@ -1533,14 +1533,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(114), - target: TransformTarget::Callable(DeclarationId(1737)), + target: TransformTarget::Callable(DeclarationId(1739)), inputs: vec![PortId(163), PortId(164)], output: PortId(165), span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(115), - target: TransformTarget::Callable(DeclarationId(1738)), + target: TransformTarget::Callable(DeclarationId(1740)), inputs: vec![PortId(162), PortId(165)], output: PortId(166), span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), @@ -1556,7 +1556,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(117), - target: TransformTarget::Callable(DeclarationId(1739)), + target: TransformTarget::Callable(DeclarationId(1741)), inputs: vec![], output: PortId(168), span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), @@ -1624,7 +1624,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(125), - target: TransformTarget::Callable(DeclarationId(1740)), + target: TransformTarget::Callable(DeclarationId(1742)), inputs: vec![PortId(174), PortId(176)], output: PortId(177), span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), @@ -1871,7 +1871,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(141), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(199)], output: PortId(200), span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983), @@ -1918,7 +1918,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(146), - target: TransformTarget::Callable(DeclarationId(1741)), + target: TransformTarget::Callable(DeclarationId(1743)), inputs: vec![PortId(205), PortId(206)], output: PortId(207), span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), @@ -2015,7 +2015,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(153), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(213)], output: PortId(214), span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254), @@ -2079,7 +2079,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(160), - target: TransformTarget::Callable(DeclarationId(1724)), + target: TransformTarget::Callable(DeclarationId(1726)), inputs: vec![PortId(222)], output: PortId(223), span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416), @@ -2162,7 +2162,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(165), - target: TransformTarget::Callable(DeclarationId(1718)), + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(227)], output: PortId(228), span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720), @@ -2263,7 +2263,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(176), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(241)], output: PortId(242), span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010), @@ -2735,7 +2735,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(291)], output: PortId(292), span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421), @@ -2830,7 +2830,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(216), - target: TransformTarget::Callable(DeclarationId(1742)), + target: TransformTarget::Callable(DeclarationId(1744)), inputs: vec![], output: PortId(305), span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), @@ -2898,7 +2898,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(224), - target: TransformTarget::Callable(DeclarationId(1743)), + target: TransformTarget::Callable(DeclarationId(1745)), inputs: vec![PortId(311), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), @@ -2987,7 +2987,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(230), - target: TransformTarget::Callable(DeclarationId(1745)), + target: TransformTarget::Callable(DeclarationId(1747)), inputs: vec![PortId(318), PortId(320)], output: PortId(321), span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), @@ -3008,7 +3008,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(233), - target: TransformTarget::Callable(DeclarationId(1746)), + target: TransformTarget::Callable(DeclarationId(1748)), inputs: vec![PortId(319), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), @@ -3051,14 +3051,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(236), - target: TransformTarget::Callable(DeclarationId(1747)), + target: TransformTarget::Callable(DeclarationId(1749)), inputs: vec![], output: PortId(327), span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(237), - target: TransformTarget::Callable(DeclarationId(1749)), + target: TransformTarget::Callable(DeclarationId(1751)), inputs: vec![PortId(326), PortId(327)], output: PortId(328), span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), @@ -3076,7 +3076,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(239), target: TransformTarget::FieldProject { field_label: "nodes".to_string(), - field_child: Some(DeclarationId(1680)), + field_child: Some(DeclarationId(1682)), }, inputs: vec![PortId(329)], output: PortId(330), @@ -3644,7 +3644,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_dag_declarations() -> Vec { { - let mut declarations = Vec::with_capacity(2265); + let mut declarations = Vec::with_capacity(2267); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -16092,11 +16092,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Empty".to_string(), - ty: DeclarationId(1499), + ty: DeclarationId(1501), }, Field { label: "Cons".to_string(), - ty: DeclarationId(1501), + ty: DeclarationId(1503), }, ], }, @@ -16129,7 +16129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1469), + output: DeclarationId(1471), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), }, type_params: vec![DeclarationId(607)], @@ -16160,8 +16160,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(608), name: Some("cons".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(609), DeclarationId(1470)], - output: DeclarationId(1471), + inputs: vec![DeclarationId(609), DeclarationId(1472)], + output: DeclarationId(1473), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), }, type_params: vec![DeclarationId(609)], @@ -16193,7 +16193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("singleton".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(611)], - output: DeclarationId(1472), + output: DeclarationId(1474), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, type_params: vec![DeclarationId(611)], @@ -16224,7 +16224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(612), name: Some("fold".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1473), DeclarationId(614), DeclarationId(1474)], + inputs: vec![DeclarationId(1475), DeclarationId(614), DeclarationId(1476)], output: DeclarationId(614), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, @@ -16270,7 +16270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(615), name: Some("fold_right".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1475), DeclarationId(617), DeclarationId(1476)], + inputs: vec![DeclarationId(1477), DeclarationId(617), DeclarationId(1478)], output: DeclarationId(617), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, @@ -16316,8 +16316,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(618), name: Some("concat".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1477), DeclarationId(1478)], - output: DeclarationId(1479), + inputs: vec![DeclarationId(1479), DeclarationId(1480)], + output: DeclarationId(1481), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)), }, type_params: vec![DeclarationId(619)], @@ -16348,8 +16348,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(620), name: Some("map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1480), DeclarationId(1481)], - output: DeclarationId(1482), + inputs: vec![DeclarationId(1482), DeclarationId(1483)], + output: DeclarationId(1484), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)), }, type_params: vec![DeclarationId(621), DeclarationId(622)], @@ -16394,8 +16394,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(623), name: Some("filter".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1483), DeclarationId(1484)], - output: DeclarationId(1485), + inputs: vec![DeclarationId(1485), DeclarationId(1486)], + output: DeclarationId(1487), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)), }, type_params: vec![DeclarationId(624)], @@ -16426,8 +16426,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(625), name: Some("flat_map".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1486), DeclarationId(1488)], - output: DeclarationId(1489), + inputs: vec![DeclarationId(1488), DeclarationId(1490)], + output: DeclarationId(1491), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)), }, type_params: vec![DeclarationId(626), DeclarationId(627)], @@ -16472,7 +16472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(628), name: Some("length".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1490)], + inputs: vec![DeclarationId(1492)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)), }, @@ -16504,7 +16504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(630), name: Some("is_empty".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1491)], + inputs: vec![DeclarationId(1493)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)), }, @@ -16575,8 +16575,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(634), name: Some("enumerate".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1492)], - output: DeclarationId(1494), + inputs: vec![DeclarationId(1494)], + output: DeclarationId(1496), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)), }, type_params: vec![DeclarationId(635)], @@ -16607,8 +16607,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(636), name: Some("enumerate_helper".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1495), DeclarationId(81)], - output: DeclarationId(1497), + inputs: vec![DeclarationId(1497), DeclarationId(81)], + output: DeclarationId(1499), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), }, type_params: vec![DeclarationId(637)], @@ -16639,7 +16639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(638), name: Some("contains".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1498), DeclarationId(639)], + inputs: vec![DeclarationId(1500), DeclarationId(639)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -16734,7 +16734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), - ty: DeclarationId(1502), + ty: DeclarationId(1504), }, ], }, @@ -16777,7 +16777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), - ty: DeclarationId(1503), + ty: DeclarationId(1505), }, ], }, @@ -16812,11 +16812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralToken".to_string(), - ty: DeclarationId(1518), + ty: DeclarationId(1520), }, Field { label: "ParamToken".to_string(), - ty: DeclarationId(1519), + ty: DeclarationId(1521), }, ], }, @@ -16836,7 +16836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1520), + ty: DeclarationId(1522), }], }, type_params: vec![], @@ -16856,11 +16856,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedSegmentTokens".to_string(), - ty: DeclarationId(1522), + ty: DeclarationId(1524), }, Field { label: "MalformedPathSegment".to_string(), - ty: DeclarationId(1523), + ty: DeclarationId(1525), }, ], }, @@ -16881,11 +16881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedPathTemplate".to_string(), - ty: DeclarationId(1524), + ty: DeclarationId(1526), }, Field { label: "MalformedPathTemplate".to_string(), - ty: DeclarationId(1525), + ty: DeclarationId(1527), }, ], }, @@ -16940,7 +16940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("last_path_param".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(649)], - output: DeclarationId(1504), + output: DeclarationId(1506), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, type_params: vec![], @@ -16960,15 +16960,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ReadEffect".to_string(), - ty: DeclarationId(1526), + ty: DeclarationId(1528), }, Field { label: "UpsertEffect".to_string(), - ty: DeclarationId(1527), + ty: DeclarationId(1529), }, Field { label: "DeleteEffect".to_string(), - ty: DeclarationId(1528), + ty: DeclarationId(1530), }, ], }, @@ -16989,11 +16989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CreateEffect".to_string(), - ty: DeclarationId(1529), + ty: DeclarationId(1531), }, Field { label: "AppendEffect".to_string(), - ty: DeclarationId(1530), + ty: DeclarationId(1532), }, ], }, @@ -17014,11 +17014,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IsIdempotent".to_string(), - ty: DeclarationId(1531), + ty: DeclarationId(1533), }, Field { label: "IsBreaking".to_string(), - ty: DeclarationId(1532), + ty: DeclarationId(1534), }, ], }, @@ -17039,11 +17039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PostAlways".to_string(), - ty: DeclarationId(1533), + ty: DeclarationId(1535), }, Field { label: "KeylessFallback".to_string(), - ty: DeclarationId(1534), + ty: DeclarationId(1536), }, ], }, @@ -17064,15 +17064,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PathParam".to_string(), - ty: DeclarationId(1535), + ty: DeclarationId(1537), }, Field { label: "InputField".to_string(), - ty: DeclarationId(1536), + ty: DeclarationId(1538), }, Field { label: "CompositeKey".to_string(), - ty: DeclarationId(1538), + ty: DeclarationId(1540), }, ], }, @@ -17093,15 +17093,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LatticeEffect".to_string(), - ty: DeclarationId(1539), + ty: DeclarationId(1541), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1540), + ty: DeclarationId(1542), }, Field { label: "NonIdempotent".to_string(), - ty: DeclarationId(1541), + ty: DeclarationId(1543), }, ], }, @@ -17183,15 +17183,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DerivedEffect".to_string(), - ty: DeclarationId(1542), + ty: DeclarationId(1544), }, Field { label: "UnknownHttpMethodInput".to_string(), - ty: DeclarationId(1543), + ty: DeclarationId(1545), }, Field { label: "MalformedPathInput".to_string(), - ty: DeclarationId(1544), + ty: DeclarationId(1546), }, ], }, @@ -17212,11 +17212,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IdempotentComposition".to_string(), - ty: DeclarationId(1545), + ty: DeclarationId(1547), }, Field { label: "BrokenBy".to_string(), - ty: DeclarationId(1547), + ty: DeclarationId(1549), }, ], }, @@ -17253,7 +17253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("breaker_ref".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(1505), + output: DeclarationId(1507), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)), }, type_params: vec![], @@ -17270,8 +17270,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(668), name: Some("indexed_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1506)], - output: DeclarationId(1508), + inputs: vec![DeclarationId(1508)], + output: DeclarationId(1510), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)), }, type_params: vec![], @@ -17288,8 +17288,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(669), name: Some("first_breaker_ref".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1509)], - output: DeclarationId(1511), + inputs: vec![DeclarationId(1511)], + output: DeclarationId(1513), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)), }, type_params: vec![], @@ -17306,7 +17306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(670), name: Some("compose_effects".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1512)], + inputs: vec![DeclarationId(1514)], output: DeclarationId(665), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, @@ -17371,19 +17371,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LinearEffect".to_string(), - ty: DeclarationId(1549), + ty: DeclarationId(1551), }, Field { label: "BranchEffect".to_string(), - ty: DeclarationId(1551), + ty: DeclarationId(1553), }, Field { label: "LoopEffect".to_string(), - ty: DeclarationId(1552), + ty: DeclarationId(1554), }, Field { label: "ParallelEffect".to_string(), - ty: DeclarationId(1554), + ty: DeclarationId(1556), }, ], }, @@ -17433,11 +17433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WorkflowCompositionVerdict".to_string(), - ty: DeclarationId(1555), + ty: DeclarationId(1557), }, Field { label: "IdempotencyUnsupported".to_string(), - ty: DeclarationId(1556), + ty: DeclarationId(1558), }, ], }, @@ -17476,23 +17476,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoWorkflowProjection".to_string(), - ty: DeclarationId(1557), + ty: DeclarationId(1559), }, Field { label: "NotParallelEffectRoot".to_string(), - ty: DeclarationId(1558), + ty: DeclarationId(1560), }, Field { label: "NonLinearParallelBranch".to_string(), - ty: DeclarationId(1559), + ty: DeclarationId(1561), }, Field { label: "PairwiseNonCommute".to_string(), - ty: DeclarationId(1560), + ty: DeclarationId(1562), }, Field { label: "LensSurfacePending".to_string(), - ty: DeclarationId(1561), + ty: DeclarationId(1563), }, ], }, @@ -17542,11 +17542,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParallelCompositionVerdict".to_string(), - ty: DeclarationId(1562), + ty: DeclarationId(1564), }, Field { label: "ParallelismUnsupported".to_string(), - ty: DeclarationId(1563), + ty: DeclarationId(1565), }, ], }, @@ -17601,7 +17601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("parse_http_method".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], - output: DeclarationId(1513), + output: DeclarationId(1515), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)), }, type_params: vec![], @@ -17636,7 +17636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(684), name: Some("upsert_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1514), DeclarationId(167)], + inputs: vec![DeclarationId(1516), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, @@ -17654,7 +17654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(685), name: Some("delete_or_create".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1515), DeclarationId(167)], + inputs: vec![DeclarationId(1517), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, @@ -17711,15 +17711,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Agrees".to_string(), - ty: DeclarationId(1564), + ty: DeclarationId(1566), }, Field { label: "Disagrees".to_string(), - ty: DeclarationId(1565), + ty: DeclarationId(1567), }, Field { label: "DerivationUnknown".to_string(), - ty: DeclarationId(1566), + ty: DeclarationId(1568), }, ], }, @@ -17740,11 +17740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ModifierNotDeclared".to_string(), - ty: DeclarationId(1567), + ty: DeclarationId(1569), }, Field { label: "ModifierDeclared".to_string(), - ty: DeclarationId(1568), + ty: DeclarationId(1570), }, ], }, @@ -17882,8 +17882,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(695), name: Some("generate_idempotency_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1516)], - output: DeclarationId(1517), + inputs: vec![DeclarationId(1518)], + output: DeclarationId(1519), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)), }, type_params: vec![], @@ -17951,15 +17951,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Uninferred".to_string(), - ty: DeclarationId(1576), + ty: DeclarationId(1578), }, Field { label: "Resolved".to_string(), - ty: DeclarationId(1577), + ty: DeclarationId(1579), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(1578), + ty: DeclarationId(1580), }, ], }, @@ -17988,7 +17988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "produced_by".to_string(), - ty: DeclarationId(1579), + ty: DeclarationId(1581), }, ], }, @@ -18009,15 +18009,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LitInt".to_string(), - ty: DeclarationId(1580), + ty: DeclarationId(1582), }, Field { label: "LitBool".to_string(), - ty: DeclarationId(1581), + ty: DeclarationId(1583), }, Field { label: "LitString".to_string(), - ty: DeclarationId(1582), + ty: DeclarationId(1584), }, ], }, @@ -18038,23 +18038,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1583), + ty: DeclarationId(1585), }, Field { label: "UnresolvedIdentifier".to_string(), - ty: DeclarationId(1584), + ty: DeclarationId(1586), }, Field { label: "ResolvedByStructure".to_string(), - ty: DeclarationId(1585), + ty: DeclarationId(1587), }, Field { label: "ResolvedByName".to_string(), - ty: DeclarationId(1586), + ty: DeclarationId(1588), }, Field { label: "TypeParam".to_string(), - ty: DeclarationId(1587), + ty: DeclarationId(1589), }, ], }, @@ -18075,15 +18075,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OneUnit".to_string(), - ty: DeclarationId(1588), + ty: DeclarationId(1590), }, Field { label: "AdditionalUnit".to_string(), - ty: DeclarationId(1589), + ty: DeclarationId(1591), }, Field { label: "UnitCount".to_string(), - ty: DeclarationId(1590), + ty: DeclarationId(1592), }, ], }, @@ -18104,11 +18104,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ZeroWidth".to_string(), - ty: DeclarationId(1591), + ty: DeclarationId(1593), }, Field { label: "PositiveWidth".to_string(), - ty: DeclarationId(1592), + ty: DeclarationId(1594), }, ], }, @@ -18129,11 +18129,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundedInterval".to_string(), - ty: DeclarationId(1593), + ty: DeclarationId(1595), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1594), + ty: DeclarationId(1596), }, ], }, @@ -18188,11 +18188,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StaticBound".to_string(), - ty: DeclarationId(1596), + ty: DeclarationId(1598), }, Field { label: "PlatformDependent".to_string(), - ty: DeclarationId(1597), + ty: DeclarationId(1599), }, ], }, @@ -18213,15 +18213,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Exact".to_string(), - ty: DeclarationId(1598), + ty: DeclarationId(1600), }, Field { label: "AtMostOne".to_string(), - ty: DeclarationId(1599), + ty: DeclarationId(1601), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1600), + ty: DeclarationId(1602), }, ], }, @@ -18317,27 +18317,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(1601), + ty: DeclarationId(1603), }, Field { label: "Reference".to_string(), - ty: DeclarationId(1602), + ty: DeclarationId(1604), }, Field { label: "Record".to_string(), - ty: DeclarationId(1604), + ty: DeclarationId(1606), }, Field { label: "List".to_string(), - ty: DeclarationId(1606), + ty: DeclarationId(1608), }, Field { label: "Map".to_string(), - ty: DeclarationId(1608), + ty: DeclarationId(1610), }, Field { label: "Variant".to_string(), - ty: DeclarationId(1610), + ty: DeclarationId(1612), }, ], }, @@ -18358,15 +18358,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueBodyUnparsed".to_string(), - ty: DeclarationId(1611), + ty: DeclarationId(1613), }, Field { label: "ValueBodyStructural".to_string(), - ty: DeclarationId(1613), + ty: DeclarationId(1615), }, Field { label: "ValueBodyMap".to_string(), - ty: DeclarationId(1615), + ty: DeclarationId(1617), }, ], }, @@ -18387,23 +18387,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserDefined".to_string(), - ty: DeclarationId(1616), + ty: DeclarationId(1618), }, Field { label: "ExternalRealization".to_string(), - ty: DeclarationId(1617), + ty: DeclarationId(1619), }, Field { label: "Pending".to_string(), - ty: DeclarationId(1618), + ty: DeclarationId(1620), }, Field { label: "NoBody".to_string(), - ty: DeclarationId(1619), + ty: DeclarationId(1621), }, Field { label: "Unparsed".to_string(), - ty: DeclarationId(1620), + ty: DeclarationId(1622), }, ], }, @@ -18424,27 +18424,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Atom".to_string(), - ty: DeclarationId(1621), + ty: DeclarationId(1623), }, Field { label: "Conj".to_string(), - ty: DeclarationId(1623), + ty: DeclarationId(1625), }, Field { label: "Disj".to_string(), - ty: DeclarationId(1625), + ty: DeclarationId(1627), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(1627), + ty: DeclarationId(1629), }, Field { label: "Cardinality".to_string(), - ty: DeclarationId(1628), + ty: DeclarationId(1630), }, Field { label: "Instantiation".to_string(), - ty: DeclarationId(1630), + ty: DeclarationId(1632), }, ], }, @@ -18469,7 +18469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), - ty: DeclarationId(1631), + ty: DeclarationId(1633), }, Field { label: "connective".to_string(), @@ -18477,27 +18477,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(1632), + ty: DeclarationId(1634), }, Field { label: "phantom_params".to_string(), - ty: DeclarationId(1633), + ty: DeclarationId(1635), }, Field { label: "meta_tag".to_string(), - ty: DeclarationId(1634), + ty: DeclarationId(1636), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(1635), + ty: DeclarationId(1637), }, Field { label: "value_body".to_string(), - ty: DeclarationId(1636), + ty: DeclarationId(1638), }, Field { label: "nominal_opacity".to_string(), - ty: DeclarationId(1637), + ty: DeclarationId(1639), }, Field { label: "span".to_string(), @@ -18546,7 +18546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "permitted_accessors".to_string(), - ty: DeclarationId(1638), + ty: DeclarationId(1640), }], }, type_params: vec![], @@ -18566,19 +18566,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Add".to_string(), - ty: DeclarationId(1639), + ty: DeclarationId(1641), }, Field { label: "Sub".to_string(), - ty: DeclarationId(1640), + ty: DeclarationId(1642), }, Field { label: "Mul".to_string(), - ty: DeclarationId(1641), + ty: DeclarationId(1643), }, Field { label: "Div".to_string(), - ty: DeclarationId(1642), + ty: DeclarationId(1644), }, ], }, @@ -18599,27 +18599,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Eq".to_string(), - ty: DeclarationId(1643), + ty: DeclarationId(1645), }, Field { label: "Ne".to_string(), - ty: DeclarationId(1644), + ty: DeclarationId(1646), }, Field { label: "Lt".to_string(), - ty: DeclarationId(1645), + ty: DeclarationId(1647), }, Field { label: "Le".to_string(), - ty: DeclarationId(1646), + ty: DeclarationId(1648), }, Field { label: "Gt".to_string(), - ty: DeclarationId(1647), + ty: DeclarationId(1649), }, Field { label: "Ge".to_string(), - ty: DeclarationId(1648), + ty: DeclarationId(1650), }, ], }, @@ -18640,11 +18640,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "And".to_string(), - ty: DeclarationId(1649), + ty: DeclarationId(1651), }, Field { label: "Or".to_string(), - ty: DeclarationId(1650), + ty: DeclarationId(1652), }, ], }, @@ -18665,15 +18665,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Arithmetic".to_string(), - ty: DeclarationId(1651), + ty: DeclarationId(1653), }, Field { label: "Comparison".to_string(), - ty: DeclarationId(1652), + ty: DeclarationId(1654), }, Field { label: "Logical".to_string(), - ty: DeclarationId(1653), + ty: DeclarationId(1655), }, ], }, @@ -18694,15 +18694,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Callable".to_string(), - ty: DeclarationId(1654), + ty: DeclarationId(1656), }, Field { label: "FieldProject".to_string(), - ty: DeclarationId(1656), + ty: DeclarationId(1658), }, Field { label: "Operator".to_string(), - ty: DeclarationId(1657), + ty: DeclarationId(1659), }, ], }, @@ -18723,11 +18723,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnresolvedVariant".to_string(), - ty: DeclarationId(1658), + ty: DeclarationId(1660), }, Field { label: "ResolvedVariant".to_string(), - ty: DeclarationId(1659), + ty: DeclarationId(1661), }, ], }, @@ -18785,7 +18785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "binding".to_string(), - ty: DeclarationId(1660), + ty: DeclarationId(1662), }, ], }, @@ -18921,11 +18921,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "members".to_string(), - ty: DeclarationId(1661), + ty: DeclarationId(1663), }, Field { label: "intra_cluster_calls".to_string(), - ty: DeclarationId(1662), + ty: DeclarationId(1664), }, ], }, @@ -18946,11 +18946,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Cardinality".to_string(), - ty: DeclarationId(1663), + ty: DeclarationId(1665), }, Field { label: "Descent".to_string(), - ty: DeclarationId(1664), + ty: DeclarationId(1666), }, ], }, @@ -19005,7 +19005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1665), + ty: DeclarationId(1667), }, ], }, @@ -19034,7 +19034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "inputs".to_string(), - ty: DeclarationId(1666), + ty: DeclarationId(1668), }, Field { label: "result_port".to_string(), @@ -19062,7 +19062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserMatch".to_string(), - ty: DeclarationId(1667), + ty: DeclarationId(1669), }], }, type_params: vec![], @@ -19090,7 +19090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "paths".to_string(), - ty: DeclarationId(1668), + ty: DeclarationId(1670), }, Field { label: "result_port".to_string(), @@ -19102,7 +19102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1669), + ty: DeclarationId(1671), }, ], }, @@ -19167,7 +19167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserCallable".to_string(), - ty: DeclarationId(1670), + ty: DeclarationId(1672), }], }, type_params: vec![], @@ -19199,7 +19199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "params".to_string(), - ty: DeclarationId(1671), + ty: DeclarationId(1673), }, Field { label: "span".to_string(), @@ -19207,11 +19207,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), - ty: DeclarationId(1672), + ty: DeclarationId(1674), }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1673), + ty: DeclarationId(1675), }, ], }, @@ -19232,23 +19232,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Value".to_string(), - ty: DeclarationId(1674), + ty: DeclarationId(1676), }, Field { label: "Transform".to_string(), - ty: DeclarationId(1675), + ty: DeclarationId(1677), }, Field { label: "Branch".to_string(), - ty: DeclarationId(1676), + ty: DeclarationId(1678), }, Field { label: "Loop".to_string(), - ty: DeclarationId(1677), + ty: DeclarationId(1679), }, Field { label: "Bind".to_string(), - ty: DeclarationId(1678), + ty: DeclarationId(1680), }, ], }, @@ -19269,19 +19269,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "declarations".to_string(), - ty: DeclarationId(1679), + ty: DeclarationId(1681), }, Field { label: "nodes".to_string(), - ty: DeclarationId(1680), + ty: DeclarationId(1682), }, Field { label: "ports".to_string(), - ty: DeclarationId(1681), + ty: DeclarationId(1683), }, Field { label: "clusters".to_string(), - ty: DeclarationId(1682), + ty: DeclarationId(1684), }, ], }, @@ -19321,15 +19321,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "accessor".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "realization".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -19348,7 +19348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("port".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(641)], - output: DeclarationId(1569), + output: DeclarationId(1571), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 18579, @@ -19370,7 +19370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("node".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(640)], - output: DeclarationId(1570), + output: DeclarationId(1572), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 18637, @@ -19392,7 +19392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("resolve_producer".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(641)], - output: DeclarationId(1571), + output: DeclarationId(1573), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 18712, @@ -19414,7 +19414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("declaration_by_id".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(642)], - output: DeclarationId(1572), + output: DeclarationId(1574), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19101, @@ -19436,7 +19436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("lane2_workflow_at".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(640)], - output: DeclarationId(1573), + output: DeclarationId(1575), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19425, @@ -19460,15 +19460,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleRoot".to_string(), - ty: DeclarationId(1683), + ty: DeclarationId(1685), }, Field { label: "NoRoot".to_string(), - ty: DeclarationId(1684), + ty: DeclarationId(1686), }, Field { label: "AmbiguousRoot".to_string(), - ty: DeclarationId(1686), + ty: DeclarationId(1688), }, ], }, @@ -19509,7 +19509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1574), + output: DeclarationId(1576), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23430, @@ -19531,7 +19531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(642)], - output: DeclarationId(1575), + output: DeclarationId(1577), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23515, @@ -19554,7 +19554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -19574,15 +19574,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShrinkEffect".to_string(), - ty: DeclarationId(1706), + ty: DeclarationId(1708), }, Field { label: "ProjectionEffect".to_string(), - ty: DeclarationId(1707), + ty: DeclarationId(1709), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1708), + ty: DeclarationId(1710), }, ], }, @@ -19603,19 +19603,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShapeConstant".to_string(), - ty: DeclarationId(1709), + ty: DeclarationId(1711), }, Field { label: "ShapeLinearScan".to_string(), - ty: DeclarationId(1710), + ty: DeclarationId(1712), }, Field { label: "ShapeIterateBody".to_string(), - ty: DeclarationId(1711), + ty: DeclarationId(1713), }, Field { label: "ShapeSortBody".to_string(), - ty: DeclarationId(1712), + ty: DeclarationId(1714), }, ], }, @@ -19644,15 +19644,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "size_effect".to_string(), - ty: DeclarationId(1713), + ty: DeclarationId(1715), }, Field { label: "cost_shape".to_string(), - ty: DeclarationId(1714), + ty: DeclarationId(1716), }, Field { label: "callback_element_position".to_string(), - ty: DeclarationId(1715), + ty: DeclarationId(1717), }, ], }, @@ -19692,11 +19692,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DegreeTwo".to_string(), - ty: DeclarationId(1716), + ty: DeclarationId(1718), }, Field { label: "DegreeSuccessor".to_string(), - ty: DeclarationId(1717), + ty: DeclarationId(1719), }, ], }, @@ -19717,31 +19717,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantCost".to_string(), - ty: DeclarationId(1718), + ty: DeclarationId(1720), }, Field { label: "LinearCost".to_string(), - ty: DeclarationId(1719), + ty: DeclarationId(1721), }, Field { label: "PolynomialCost".to_string(), - ty: DeclarationId(1720), + ty: DeclarationId(1722), }, Field { label: "ProductCost".to_string(), - ty: DeclarationId(1722), + ty: DeclarationId(1724), }, Field { label: "SumCost".to_string(), - ty: DeclarationId(1724), + ty: DeclarationId(1726), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(1725), + ty: DeclarationId(1727), }, Field { label: "UnknownCost".to_string(), - ty: DeclarationId(1726), + ty: DeclarationId(1728), }, ], }, @@ -19803,7 +19803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1687), + output: DeclarationId(1689), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9870, 9880)), }, type_params: vec![], @@ -19821,7 +19821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(762)], - output: DeclarationId(1688), + output: DeclarationId(1690), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9954, 9969)), }, type_params: vec![], @@ -19839,7 +19839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("two_terms".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(762), DeclarationId(762)], - output: DeclarationId(1689), + output: DeclarationId(1691), body: ArrowBody::UserDefined(NodeId(10)), }, type_params: vec![], @@ -19856,8 +19856,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(768), name: Some("many_terms".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1690)], - output: DeclarationId(1691), + inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1692)], + output: DeclarationId(1693), body: ArrowBody::UserDefined(NodeId(12)), }, type_params: vec![], @@ -19982,7 +19982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(775), name: Some("max_path".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1692)], + inputs: vec![DeclarationId(1694)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(45)), }, @@ -20054,8 +20054,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(779), name: Some("nsl_to_list".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1693)], - output: DeclarationId(1694), + inputs: vec![DeclarationId(1695)], + output: DeclarationId(1696), body: ArrowBody::UserDefined(NodeId(116)), }, type_params: vec![], @@ -20072,8 +20072,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(780), name: Some("drop_zero".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1695)], - output: DeclarationId(1696), + inputs: vec![DeclarationId(1697)], + output: DeclarationId(1698), body: ArrowBody::UserDefined(NodeId(129)), }, type_params: vec![], @@ -20108,7 +20108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(782), name: Some("reduce_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1697)], + inputs: vec![DeclarationId(1699)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(151)), }, @@ -20126,7 +20126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(783), name: Some("wrap_sum".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1698)], + inputs: vec![DeclarationId(1700)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(163)), }, @@ -20144,7 +20144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(784), name: Some("reduce_product".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1699)], + inputs: vec![DeclarationId(1701)], output: DeclarationId(762), body: ArrowBody::UserDefined(NodeId(180)), }, @@ -20293,8 +20293,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(792), name: Some("filter_not_dominated_by".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1700), DeclarationId(762)], - output: DeclarationId(1701), + inputs: vec![DeclarationId(1702), DeclarationId(762)], + output: DeclarationId(1703), body: ArrowBody::UserDefined(NodeId(228)), }, type_params: vec![], @@ -20311,8 +20311,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(793), name: Some("drop_dominated_step".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1702), DeclarationId(762)], - output: DeclarationId(1703), + inputs: vec![DeclarationId(1704), DeclarationId(762)], + output: DeclarationId(1705), body: ArrowBody::UserDefined(NodeId(235)), }, type_params: vec![], @@ -20329,8 +20329,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(794), name: Some("drop_dominated".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1704)], - output: DeclarationId(1705), + inputs: vec![DeclarationId(1706)], + output: DeclarationId(1707), body: ArrowBody::UserDefined(NodeId(238)), }, type_params: vec![], @@ -20350,10 +20350,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inputs: vec![ DeclarationId(118), DeclarationId(197), - DeclarationId(1750), - DeclarationId(81), - DeclarationId(1751), DeclarationId(1752), + DeclarationId(81), + DeclarationId(1753), + DeclarationId(1754), ], output: DeclarationId(803), body: ArrowBody::Unparsed(SourceSpan::new( @@ -20379,12 +20379,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1027), + value: DeclarationId(1029), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1753)), + meta_tag: Some(DeclarationId(1755)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![])), @@ -20399,11 +20399,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserMessage".to_string(), - ty: DeclarationId(1755), + ty: DeclarationId(1757), }, Field { label: "AssistantMessage".to_string(), - ty: DeclarationId(1757), + ty: DeclarationId(1759), }, ], }, @@ -20424,11 +20424,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserTextBlock".to_string(), - ty: DeclarationId(1758), + ty: DeclarationId(1760), }, Field { label: "UserToolResultBlock".to_string(), - ty: DeclarationId(1760), + ty: DeclarationId(1762), }, ], }, @@ -20449,11 +20449,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AssistantTextBlock".to_string(), - ty: DeclarationId(1761), + ty: DeclarationId(1763), }, Field { label: "AssistantToolUseBlock".to_string(), - ty: DeclarationId(1762), + ty: DeclarationId(1764), }, ], }, @@ -20474,31 +20474,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EndTurn".to_string(), - ty: DeclarationId(1763), + ty: DeclarationId(1765), }, Field { label: "MaxTokens".to_string(), - ty: DeclarationId(1764), + ty: DeclarationId(1766), }, Field { label: "StopSequence".to_string(), - ty: DeclarationId(1765), + ty: DeclarationId(1767), }, Field { label: "ToolUse".to_string(), - ty: DeclarationId(1766), + ty: DeclarationId(1768), }, Field { label: "PauseTurn".to_string(), - ty: DeclarationId(1767), + ty: DeclarationId(1769), }, Field { label: "Refusal".to_string(), - ty: DeclarationId(1768), + ty: DeclarationId(1770), }, Field { label: "ModelContextWindowExceeded".to_string(), - ty: DeclarationId(1769), + ty: DeclarationId(1771), }, ], }, @@ -20581,7 +20581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "content".to_string(), - ty: DeclarationId(1770), + ty: DeclarationId(1772), }, Field { label: "model".to_string(), @@ -20593,7 +20593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "stop_sequence".to_string(), - ty: DeclarationId(1771), + ty: DeclarationId(1773), }, Field { label: "usage".to_string(), @@ -20618,23 +20618,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ToNearestEven".to_string(), - ty: DeclarationId(1772), + ty: DeclarationId(1774), }, Field { label: "ToZero".to_string(), - ty: DeclarationId(1773), + ty: DeclarationId(1775), }, Field { label: "ToPositiveInfinity".to_string(), - ty: DeclarationId(1774), + ty: DeclarationId(1776), }, Field { label: "ToNegativeInfinity".to_string(), - ty: DeclarationId(1775), + ty: DeclarationId(1777), }, Field { label: "ToAwayFromZero".to_string(), - ty: DeclarationId(1776), + ty: DeclarationId(1778), }, ], }, @@ -20655,15 +20655,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Unbounded".to_string(), - ty: DeclarationId(1777), + ty: DeclarationId(1779), }, Field { label: "BinaryPrecision".to_string(), - ty: DeclarationId(1778), + ty: DeclarationId(1780), }, Field { label: "DecimalPrecision".to_string(), - ty: DeclarationId(1779), + ty: DeclarationId(1781), }, ], }, @@ -20684,15 +20684,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoNaN".to_string(), - ty: DeclarationId(1780), + ty: DeclarationId(1782), }, Field { label: "QuietNaN".to_string(), - ty: DeclarationId(1781), + ty: DeclarationId(1783), }, Field { label: "QuietAndSignalingNaN".to_string(), - ty: DeclarationId(1782), + ty: DeclarationId(1784), }, ], }, @@ -20713,11 +20713,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoInfinity".to_string(), - ty: DeclarationId(1783), + ty: DeclarationId(1785), }, Field { label: "SignedInfinity".to_string(), - ty: DeclarationId(1784), + ty: DeclarationId(1786), }, ], }, @@ -20738,11 +20738,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoSignedZero".to_string(), - ty: DeclarationId(1785), + ty: DeclarationId(1787), }, Field { label: "SignedZero".to_string(), - ty: DeclarationId(1786), + ty: DeclarationId(1788), }, ], }, @@ -20763,15 +20763,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoSubnormals".to_string(), - ty: DeclarationId(1787), + ty: DeclarationId(1789), }, Field { label: "GradualUnderflow".to_string(), - ty: DeclarationId(1788), + ty: DeclarationId(1790), }, Field { label: "FlushToZero".to_string(), - ty: DeclarationId(1789), + ty: DeclarationId(1791), }, ], }, @@ -20821,7 +20821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "base".to_string(), - ty: DeclarationId(1790), + ty: DeclarationId(1792), }, Field { label: "rounding".to_string(), @@ -20880,7 +20880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "entry".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -20901,11 +20901,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Retired".to_string(), - ty: DeclarationId(1791), + ty: DeclarationId(1793), }, Field { label: "Open".to_string(), - ty: DeclarationId(1792), + ty: DeclarationId(1794), }, ], }, @@ -20925,7 +20925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -20971,7 +20971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5984, 6094), }); - declarations.push(Declaration { id: DeclarationId(817), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(816) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1793)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1791), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1792), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); + declarations.push(Declaration { id: DeclarationId(817), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(816) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1795)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1793), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1793), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1794), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); declarations.push(Declaration { id: DeclarationId(818), name: Some("CleanEmissionContract".to_string()), @@ -21057,15 +21057,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapEverything".to_string(), - ty: DeclarationId(1794), + ty: DeclarationId(1796), }, Field { label: "WrapOnlyInOperandPosition".to_string(), - ty: DeclarationId(1795), + ty: DeclarationId(1797), }, Field { label: "NoWrapping".to_string(), - ty: DeclarationId(1796), + ty: DeclarationId(1798), }, ], }, @@ -21086,19 +21086,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitBindingAlways".to_string(), - ty: DeclarationId(1797), + ty: DeclarationId(1799), }, Field { label: "EmitUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1798), + ty: DeclarationId(1800), }, Field { label: "EmitPrefixedUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1799), + ty: DeclarationId(1801), }, Field { label: "NotApplicablePatternBinding".to_string(), - ty: DeclarationId(1800), + ty: DeclarationId(1802), }, ], }, @@ -21119,11 +21119,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AccessFromPayloadBinding".to_string(), - ty: DeclarationId(1801), + ty: DeclarationId(1803), }, Field { label: "OverrideNamedFieldsAtBindingSite".to_string(), - ty: DeclarationId(1802), + ty: DeclarationId(1804), }, ], }, @@ -21144,15 +21144,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ImportEverythingDeclared".to_string(), - ty: DeclarationId(1803), + ty: DeclarationId(1805), }, Field { label: "IncludeOnlyReferenced".to_string(), - ty: DeclarationId(1804), + ty: DeclarationId(1806), }, Field { label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(1805), + ty: DeclarationId(1807), }, ], }, @@ -21173,15 +21173,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapReturnValue".to_string(), - ty: DeclarationId(1806), + ty: DeclarationId(1808), }, Field { label: "NoWrappingOnTerminalExpression".to_string(), - ty: DeclarationId(1807), + ty: DeclarationId(1809), }, Field { label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(1808), + ty: DeclarationId(1810), }, ], }, @@ -21202,15 +21202,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitLetBindingAlways".to_string(), - ty: DeclarationId(1809), + ty: DeclarationId(1811), }, Field { label: "EmitLetUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1810), + ty: DeclarationId(1812), }, Field { label: "OmitLetBinding".to_string(), - ty: DeclarationId(1811), + ty: DeclarationId(1813), }, ], }, @@ -21231,15 +21231,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapBody".to_string(), - ty: DeclarationId(1812), + ty: DeclarationId(1814), }, Field { label: "NoWrappingOnNonComplexBody".to_string(), - ty: DeclarationId(1813), + ty: DeclarationId(1815), }, Field { label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(1814), + ty: DeclarationId(1816), }, ], }, @@ -21297,7 +21297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(1815), + ty: DeclarationId(1817), }, Field { label: "syntax_only".to_string(), @@ -21330,19 +21330,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IgnoreVerifierOutput".to_string(), - ty: DeclarationId(1816), + ty: DeclarationId(1818), }, Field { label: "RequireEmptyStdout".to_string(), - ty: DeclarationId(1817), + ty: DeclarationId(1819), }, Field { label: "RequireEmptyStderr".to_string(), - ty: DeclarationId(1818), + ty: DeclarationId(1820), }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), - ty: DeclarationId(1819), + ty: DeclarationId(1821), }, ], }, @@ -21363,35 +21363,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CollectionSize".to_string(), - ty: DeclarationId(1824), + ty: DeclarationId(1826), }, Field { label: "ParserStreamSize".to_string(), - ty: DeclarationId(1825), + ty: DeclarationId(1827), }, Field { label: "WorklistDrainSize".to_string(), - ty: DeclarationId(1826), + ty: DeclarationId(1828), }, Field { label: "TreeSize".to_string(), - ty: DeclarationId(1827), + ty: DeclarationId(1829), }, Field { label: "ArithmeticParam".to_string(), - ty: DeclarationId(1828), + ty: DeclarationId(1830), }, Field { label: "ExplicitCountZero".to_string(), - ty: DeclarationId(1829), + ty: DeclarationId(1831), }, Field { label: "ExplicitCountPositive".to_string(), - ty: DeclarationId(1830), + ty: DeclarationId(1832), }, Field { label: "Forever".to_string(), - ty: DeclarationId(1831), + ty: DeclarationId(1833), }, ], }, @@ -21431,7 +21431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(832), name: Some("positive_descent_count".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1036)], + inputs: vec![DeclarationId(1038)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", @@ -21456,35 +21456,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ChildAccessorCall".to_string(), - ty: DeclarationId(1832), + ty: DeclarationId(1834), }, Field { label: "CollectionShrinkCall".to_string(), - ty: DeclarationId(1833), + ty: DeclarationId(1835), }, Field { label: "ArithmeticSubtractCall".to_string(), - ty: DeclarationId(1834), + ty: DeclarationId(1836), }, Field { label: "ArithmeticDivideCall".to_string(), - ty: DeclarationId(1835), + ty: DeclarationId(1837), }, Field { label: "ParserAdvanceCall".to_string(), - ty: DeclarationId(1836), + ty: DeclarationId(1838), }, Field { label: "WorklistDrainCall".to_string(), - ty: DeclarationId(1837), + ty: DeclarationId(1839), }, Field { label: "FoldBodyCall".to_string(), - ty: DeclarationId(1838), + ty: DeclarationId(1840), }, Field { label: "SameArgumentCall".to_string(), - ty: DeclarationId(1839), + ty: DeclarationId(1841), }, ], }, @@ -21505,15 +21505,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnitShrink".to_string(), - ty: DeclarationId(1840), + ty: DeclarationId(1842), }, Field { label: "ConstantShrink".to_string(), - ty: DeclarationId(1841), + ty: DeclarationId(1843), }, Field { label: "ProportionalShrink".to_string(), - ty: DeclarationId(1842), + ty: DeclarationId(1844), }, ], }, @@ -21534,15 +21534,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Fold".to_string(), - ty: DeclarationId(1843), + ty: DeclarationId(1845), }, Field { label: "Descend".to_string(), - ty: DeclarationId(1844), + ty: DeclarationId(1846), }, Field { label: "Repeat".to_string(), - ty: DeclarationId(1845), + ty: DeclarationId(1847), }, ], }, @@ -21571,11 +21571,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), - ty: DeclarationId(1028), + ty: DeclarationId(1030), }, Field { label: "factor".to_string(), - ty: DeclarationId(1846), + ty: DeclarationId(1848), }, ], }, @@ -21616,7 +21616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("size_bound_param".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(830)], - output: DeclarationId(1820), + output: DeclarationId(1822), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5369, @@ -21682,7 +21682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("constant_bound_value".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(830)], - output: DeclarationId(1821), + output: DeclarationId(1823), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6297, @@ -21706,15 +21706,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TreeDescent".to_string(), - ty: DeclarationId(1847), + ty: DeclarationId(1849), }, Field { label: "CollectionFold".to_string(), - ty: DeclarationId(1848), + ty: DeclarationId(1850), }, Field { label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(1849), + ty: DeclarationId(1851), }, ], }, @@ -21733,7 +21733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("algebra_profile_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(53)], - output: DeclarationId(1822), + output: DeclarationId(1824), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7370, @@ -21755,7 +21755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("type_iteration_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], - output: DeclarationId(1823), + output: DeclarationId(1825), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7935, @@ -21779,11 +21779,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Immutable".to_string(), - ty: DeclarationId(1850), + ty: DeclarationId(1852), }, Field { label: "Mutable".to_string(), - ty: DeclarationId(1851), + ty: DeclarationId(1853), }, ], }, @@ -21804,11 +21804,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Pure".to_string(), - ty: DeclarationId(1852), + ty: DeclarationId(1854), }, Field { label: "Effectful".to_string(), - ty: DeclarationId(1853), + ty: DeclarationId(1855), }, ], }, @@ -21829,11 +21829,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ExplicitDAG".to_string(), - ty: DeclarationId(1854), + ty: DeclarationId(1856), }, Field { label: "Arbitrary".to_string(), - ty: DeclarationId(1855), + ty: DeclarationId(1857), }, ], }, @@ -21854,11 +21854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Bounded".to_string(), - ty: DeclarationId(1856), + ty: DeclarationId(1858), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1857), + ty: DeclarationId(1859), }, ], }, @@ -21922,28 +21922,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "mutability".to_string(), FieldValue::Variant { - constructor: DeclarationId(1850), + constructor: DeclarationId(1852), payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { - constructor: DeclarationId(1852), + constructor: DeclarationId(1854), payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { - constructor: DeclarationId(1854), + constructor: DeclarationId(1856), payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { - constructor: DeclarationId(1856), + constructor: DeclarationId(1858), payload: vec![], }, ), @@ -21960,19 +21960,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueOnly".to_string(), - ty: DeclarationId(1858), + ty: DeclarationId(1860), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(1859), + ty: DeclarationId(1861), }, Field { label: "RefCounted".to_string(), - ty: DeclarationId(1860), + ty: DeclarationId(1862), }, Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(1861), + ty: DeclarationId(1863), }, ], }, @@ -21993,11 +21993,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LexicalScoping".to_string(), - ty: DeclarationId(1862), + ty: DeclarationId(1864), }, Field { label: "DynamicScoping".to_string(), - ty: DeclarationId(1863), + ty: DeclarationId(1865), }, ], }, @@ -22042,7 +22042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "excluded_prefixes".to_string(), - ty: DeclarationId(1864), + ty: DeclarationId(1866), }], }, type_params: vec![], @@ -22066,7 +22066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "additional_excluded_prefixes".to_string(), - ty: DeclarationId(1865), + ty: DeclarationId(1867), }, ], }, @@ -22114,11 +22114,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(1866), + ty: DeclarationId(1868), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(1867), + ty: DeclarationId(1869), }, ], }, @@ -22139,31 +22139,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TokenizerError".to_string(), - ty: DeclarationId(1868), + ty: DeclarationId(1870), }, Field { label: "ParseError".to_string(), - ty: DeclarationId(1869), + ty: DeclarationId(1871), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(1870), + ty: DeclarationId(1872), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(1871), + ty: DeclarationId(1873), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(1872), + ty: DeclarationId(1874), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(1873), + ty: DeclarationId(1875), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(1874), + ty: DeclarationId(1876), }, ], }, @@ -22237,7 +22237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "kind_decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -22257,11 +22257,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CompilerKind".to_string(), - ty: DeclarationId(1875), + ty: DeclarationId(1877), }, Field { label: "LensInstanceKind".to_string(), - ty: DeclarationId(1876), + ty: DeclarationId(1878), }, ], }, @@ -22294,7 +22294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fixes".to_string(), - ty: DeclarationId(1877), + ty: DeclarationId(1879), }, ], }, @@ -22315,31 +22315,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnderRefined".to_string(), - ty: DeclarationId(1878), + ty: DeclarationId(1880), }, Field { label: "NoInhabitant".to_string(), - ty: DeclarationId(1879), + ty: DeclarationId(1881), }, Field { label: "ContradictoryUse".to_string(), - ty: DeclarationId(1881), + ty: DeclarationId(1883), }, Field { label: "OutOfR2Scope".to_string(), - ty: DeclarationId(1882), + ty: DeclarationId(1884), }, Field { label: "LifetimeProgramExtractionPending".to_string(), - ty: DeclarationId(1883), + ty: DeclarationId(1885), }, Field { label: "FoldNotImplemented".to_string(), - ty: DeclarationId(1884), + ty: DeclarationId(1886), }, Field { label: "MissingEmissionPath".to_string(), - ty: DeclarationId(1885), + ty: DeclarationId(1887), }, ], }, @@ -22360,11 +22360,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Inhabits".to_string(), - ty: DeclarationId(1900), + ty: DeclarationId(1902), }, Field { label: "Violates".to_string(), - ty: DeclarationId(1901), + ty: DeclarationId(1903), }, ], }, @@ -22399,11 +22399,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoDiagnostic".to_string(), - ty: DeclarationId(1902), + ty: DeclarationId(1904), }, Field { label: "SomeDiagnostic".to_string(), - ty: DeclarationId(1903), + ty: DeclarationId(1905), }, ], }, @@ -22424,11 +22424,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DimensionOk".to_string(), - ty: DeclarationId(1906), + ty: DeclarationId(1908), }, Field { label: "DimensionFail".to_string(), - ty: DeclarationId(1910), + ty: DeclarationId(1912), }, ], }, @@ -22467,11 +22467,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witness_of".to_string(), - ty: DeclarationId(1912), + ty: DeclarationId(1914), }, Field { label: "compose".to_string(), - ty: DeclarationId(1913), + ty: DeclarationId(1915), }, Field { label: "identity".to_string(), @@ -22479,7 +22479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "break_diagnostic".to_string(), - ty: DeclarationId(1914), + ty: DeclarationId(1916), }, ], }, @@ -22519,7 +22519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { type_params: vec![DeclarationId(873), DeclarationId(874)], phantom_params: vec![PhantomParameter { parameter: DeclarationId(873), - algebra: DeclarationId(1915), + algebra: DeclarationId(1917), }], meta_tag: None, specialization_parent: None, @@ -22660,11 +22660,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("add_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(1886), - DeclarationId(1887), DeclarationId(1888), + DeclarationId(1889), + DeclarationId(1890), ], - output: DeclarationId(1889), + output: DeclarationId(1891), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4316, 4338)), }, type_params: vec![DeclarationId(883), DeclarationId(884)], @@ -22710,11 +22710,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(1890), - DeclarationId(1891), DeclarationId(1892), + DeclarationId(1893), + DeclarationId(1894), ], - output: DeclarationId(1893), + output: DeclarationId(1895), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4512, 4534)), }, type_params: vec![DeclarationId(886), DeclarationId(887)], @@ -22759,8 +22759,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(888), name: Some("mul_dimension_scalar".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1894), DeclarationId(1895), DeclarationId(890)], - output: DeclarationId(1896), + inputs: vec![DeclarationId(1896), DeclarationId(1897), DeclarationId(890)], + output: DeclarationId(1898), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4700, 4729)), }, type_params: vec![DeclarationId(889), DeclarationId(890)], @@ -22805,8 +22805,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(891), name: Some("div_dimension_scalar".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1897), DeclarationId(1898), DeclarationId(893)], - output: DeclarationId(1899), + inputs: vec![DeclarationId(1899), DeclarationId(1900), DeclarationId(893)], + output: DeclarationId(1901), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4895, 4924)), }, type_params: vec![DeclarationId(892), DeclarationId(893)], @@ -22854,11 +22854,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -22870,7 +22870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(1916), + ty: DeclarationId(1918), }, Field { label: "cost".to_string(), @@ -22895,15 +22895,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "kernel_integer".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "algebra".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "bound".to_string(), @@ -22911,7 +22911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_realization".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -22932,11 +22932,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundUnspecified".to_string(), - ty: DeclarationId(1917), + ty: DeclarationId(1919), }, Field { label: "StaticBoundFact".to_string(), - ty: DeclarationId(1918), + ty: DeclarationId(1920), }, ], }, @@ -22986,11 +22986,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectField".to_string(), - ty: DeclarationId(1919), + ty: DeclarationId(1921), }, Field { label: "AccessorMethod".to_string(), - ty: DeclarationId(1920), + ty: DeclarationId(1922), }, ], }, @@ -23011,15 +23011,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "op".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -23048,11 +23048,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -23081,11 +23081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "strategy".to_string(), @@ -23093,7 +23093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "parameters".to_string(), - ty: DeclarationId(1921), + ty: DeclarationId(1923), }, Field { label: "cost".to_string(), @@ -23143,11 +23143,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrowed".to_string(), - ty: DeclarationId(1922), + ty: DeclarationId(1924), }, Field { label: "Consumed".to_string(), - ty: DeclarationId(1923), + ty: DeclarationId(1925), }, ], }, @@ -23168,11 +23168,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Owned".to_string(), - ty: DeclarationId(1924), + ty: DeclarationId(1926), }, Field { label: "Borrowed".to_string(), - ty: DeclarationId(1925), + ty: DeclarationId(1927), }, ], }, @@ -23193,11 +23193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SelfContained".to_string(), - ty: DeclarationId(1926), + ty: DeclarationId(1928), }, Field { label: "Caller".to_string(), - ty: DeclarationId(1927), + ty: DeclarationId(1929), }, ], }, @@ -23218,15 +23218,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Growable".to_string(), - ty: DeclarationId(1928), + ty: DeclarationId(1930), }, Field { label: "Fixed".to_string(), - ty: DeclarationId(1929), + ty: DeclarationId(1931), }, Field { label: "NotApplicable".to_string(), - ty: DeclarationId(1930), + ty: DeclarationId(1932), }, ], }, @@ -23246,7 +23246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "Utf8FreeMonoidChar".to_string(), - ty: DeclarationId(1931), + ty: DeclarationId(1933), }], }, type_params: vec![], @@ -23266,11 +23266,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "carrier".to_string(), @@ -23299,43 +23299,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ListEmpty".to_string(), - ty: DeclarationId(1932), + ty: DeclarationId(1934), }, Field { label: "ListSingleton".to_string(), - ty: DeclarationId(1933), + ty: DeclarationId(1935), }, Field { label: "ListCons".to_string(), - ty: DeclarationId(1934), + ty: DeclarationId(1936), }, Field { label: "ListConcat".to_string(), - ty: DeclarationId(1935), + ty: DeclarationId(1937), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(1936), + ty: DeclarationId(1938), }, Field { label: "ListIsEmpty".to_string(), - ty: DeclarationId(1937), + ty: DeclarationId(1939), }, Field { label: "ListFold".to_string(), - ty: DeclarationId(1938), + ty: DeclarationId(1940), }, Field { label: "ListMap".to_string(), - ty: DeclarationId(1939), + ty: DeclarationId(1941), }, Field { label: "ListFilter".to_string(), - ty: DeclarationId(1940), + ty: DeclarationId(1942), }, Field { label: "ListContains".to_string(), - ty: DeclarationId(1941), + ty: DeclarationId(1943), }, ], }, @@ -23356,11 +23356,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "strategy".to_string(), @@ -23368,11 +23368,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "empty_variant".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "cons_variant".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "scrutinee".to_string(), @@ -23417,11 +23417,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PlaceholderPatternStrategy".to_string(), - ty: DeclarationId(1942), + ty: DeclarationId(1944), }, Field { label: "VectorList".to_string(), - ty: DeclarationId(1943), + ty: DeclarationId(1945), }, ], }, @@ -23884,11 +23884,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrow".to_string(), - ty: DeclarationId(1944), + ty: DeclarationId(1946), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(1945), + ty: DeclarationId(1947), }, ], }, @@ -23909,11 +23909,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CopyOrClone".to_string(), - ty: DeclarationId(1946), + ty: DeclarationId(1948), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(1947), + ty: DeclarationId(1949), }, ], }, @@ -23934,51 +23934,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "statements".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "expressions".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "control_flow".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "literals".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "modules".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "functions".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "type_applications".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "type_definitions".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "record_derive_templates".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "patterns".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "collection_ops".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "values".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -23999,11 +23999,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IndexedArgs".to_string(), - ty: DeclarationId(1948), + ty: DeclarationId(1950), }, Field { label: "NamedArg".to_string(), - ty: DeclarationId(1949), + ty: DeclarationId(1951), }, ], }, @@ -24024,11 +24024,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleTemplate".to_string(), - ty: DeclarationId(1950), + ty: DeclarationId(1952), }, Field { label: "HigherOrderTemplates".to_string(), - ty: DeclarationId(1951), + ty: DeclarationId(1953), }, ], }, @@ -24212,7 +24212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1952)), + meta_tag: Some(DeclarationId(1954)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -24231,7 +24231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -24244,7 +24244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24266,7 +24266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -24279,7 +24279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24301,7 +24301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -24314,7 +24314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24336,7 +24336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg}...)".to_string(), ))], @@ -24349,7 +24349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24371,7 +24371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Map({recv}, {arg})".to_string(), ))], @@ -24384,7 +24384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24406,7 +24406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -24419,7 +24419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24441,7 +24441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -24454,7 +24454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24476,7 +24476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -24489,7 +24489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24511,7 +24511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -24524,7 +24524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24544,7 +24544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -24557,7 +24557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24577,7 +24577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -24590,7 +24590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24612,7 +24612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Fold({recv}, {arg})".to_string(), ))], @@ -24625,7 +24625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24647,7 +24647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -24660,7 +24660,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24682,7 +24682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -24695,7 +24695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -24712,23 +24712,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectRecursion".to_string(), - ty: DeclarationId(1962), + ty: DeclarationId(1964), }, Field { label: "ListRecursion".to_string(), - ty: DeclarationId(1963), + ty: DeclarationId(1965), }, Field { label: "OptionalRecursion".to_string(), - ty: DeclarationId(1964), + ty: DeclarationId(1966), }, Field { label: "SetRecursion".to_string(), - ty: DeclarationId(1965), + ty: DeclarationId(1967), }, Field { label: "MapValueRecursion".to_string(), - ty: DeclarationId(1966), + ty: DeclarationId(1968), }, ], }, @@ -24820,7 +24820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("inductive_field_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(937), DeclarationId(197)], - output: DeclarationId(1035), + output: DeclarationId(1037), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)), }, type_params: vec![], @@ -24840,23 +24840,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StrictSubValue".to_string(), - ty: DeclarationId(1967), + ty: DeclarationId(1969), }, Field { label: "IteratedSubValue".to_string(), - ty: DeclarationId(1968), + ty: DeclarationId(1970), }, Field { label: "ArithmeticDescent".to_string(), - ty: DeclarationId(1969), + ty: DeclarationId(1971), }, Field { label: "PreservedValue".to_string(), - ty: DeclarationId(1970), + ty: DeclarationId(1972), }, Field { label: "SubValueUnknown".to_string(), - ty: DeclarationId(1971), + ty: DeclarationId(1973), }, ], }, @@ -24875,7 +24875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_evidence".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(941)], - output: DeclarationId(1028), + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 11067, @@ -25007,7 +25007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_call_pattern".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(941)], - output: DeclarationId(1953), + output: DeclarationId(1955), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20518, @@ -25029,7 +25029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_value_to_lowering_target".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(941)], - output: DeclarationId(1954), + output: DeclarationId(1956), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21906, @@ -25053,19 +25053,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IntegerExpZero".to_string(), - ty: DeclarationId(1972), + ty: DeclarationId(1974), }, Field { label: "IntegerExpPos".to_string(), - ty: DeclarationId(1973), + ty: DeclarationId(1975), }, Field { label: "FractionExp".to_string(), - ty: DeclarationId(1974), + ty: DeclarationId(1976), }, Field { label: "LogBasedExp".to_string(), - ty: DeclarationId(1975), + ty: DeclarationId(1977), }, ], }, @@ -25108,11 +25108,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PolyCost".to_string(), - ty: DeclarationId(1976), + ty: DeclarationId(1978), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(1977), + ty: DeclarationId(1979), }, ], }, @@ -25133,31 +25133,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantBound".to_string(), - ty: DeclarationId(1978), + ty: DeclarationId(1980), }, Field { label: "AtomicBound".to_string(), - ty: DeclarationId(1979), + ty: DeclarationId(1981), }, Field { label: "ProductBound".to_string(), - ty: DeclarationId(1981), + ty: DeclarationId(1983), }, Field { label: "SumOfProductsBound".to_string(), - ty: DeclarationId(1984), + ty: DeclarationId(1986), }, Field { label: "SumBound".to_string(), - ty: DeclarationId(1986), + ty: DeclarationId(1988), }, Field { label: "ForeverBound".to_string(), - ty: DeclarationId(1987), + ty: DeclarationId(1989), }, Field { label: "ErrorBound".to_string(), - ty: DeclarationId(1988), + ty: DeclarationId(1990), }, ], }, @@ -25175,7 +25175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(954), name: Some("sum_bound".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1955)], + inputs: vec![DeclarationId(1957)], output: DeclarationId(953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", @@ -25451,7 +25451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_add_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1956), + output: DeclarationId(1958), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31955, @@ -25473,7 +25473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_mul_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1957), + output: DeclarationId(1959), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 32251, @@ -25495,7 +25495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("bounded_int_pow_exponent".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(1958), + output: DeclarationId(1960), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33500, @@ -25517,7 +25517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_pow_bounded".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1959), + output: DeclarationId(1961), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33975, @@ -25539,7 +25539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("ceil_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], - output: DeclarationId(1960), + output: DeclarationId(1962), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35238, @@ -25566,7 +25566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(81), DeclarationId(81), ], - output: DeclarationId(1961), + output: DeclarationId(1963), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35510, @@ -25969,12 +25969,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1989)), + meta_tag: Some(DeclarationId(1991)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -25995,12 +25995,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1990)), + meta_tag: Some(DeclarationId(1992)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -26025,23 +26025,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "read".to_string(), - ty: DeclarationId(1992), + ty: DeclarationId(1994), }, Field { label: "sequential".to_string(), - ty: DeclarationId(1993), + ty: DeclarationId(1995), }, Field { label: "branch".to_string(), - ty: DeclarationId(1994), + ty: DeclarationId(1996), }, Field { label: "iterate".to_string(), - ty: DeclarationId(1995), + ty: DeclarationId(1997), }, Field { label: "validate".to_string(), - ty: DeclarationId(1996), + ty: DeclarationId(1998), }, ], }, @@ -26076,11 +26076,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Miss".to_string(), - ty: DeclarationId(1999), + ty: DeclarationId(2001), }, Field { label: "Hit".to_string(), - ty: DeclarationId(2000), + ty: DeclarationId(2002), }, ], }, @@ -26113,7 +26113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], - output: DeclarationId(1997), + output: DeclarationId(1999), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)), }, type_params: vec![], @@ -26131,7 +26131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(1998), + output: DeclarationId(2000), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)), }, type_params: vec![], @@ -26169,7 +26169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "items".to_string(), - ty: DeclarationId(2001), + ty: DeclarationId(2003), }], }, type_params: vec![], @@ -26197,7 +26197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), - ty: DeclarationId(2002), + ty: DeclarationId(2004), }, ], }, @@ -26272,11 +26272,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Positional".to_string(), - ty: DeclarationId(2004), + ty: DeclarationId(2006), }, Field { label: "Record".to_string(), - ty: DeclarationId(2006), + ty: DeclarationId(2008), }, ], }, @@ -26297,19 +26297,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Named".to_string(), - ty: DeclarationId(2007), + ty: DeclarationId(2009), }, Field { label: "Parameterized".to_string(), - ty: DeclarationId(2009), + ty: DeclarationId(2011), }, Field { label: "Optional".to_string(), - ty: DeclarationId(2010), + ty: DeclarationId(2012), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2012), + ty: DeclarationId(2014), }, ], }, @@ -26450,15 +26450,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BareVariant".to_string(), - ty: DeclarationId(2013), + ty: DeclarationId(2015), }, Field { label: "VariantWith".to_string(), - ty: DeclarationId(2014), + ty: DeclarationId(2016), }, Field { label: "VariantFields".to_string(), - ty: DeclarationId(2016), + ty: DeclarationId(2018), }, ], }, @@ -26479,15 +26479,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Int".to_string(), - ty: DeclarationId(2017), + ty: DeclarationId(2019), }, Field { label: "Bool".to_string(), - ty: DeclarationId(2018), + ty: DeclarationId(2020), }, Field { label: "String".to_string(), - ty: DeclarationId(2019), + ty: DeclarationId(2021), }, ], }, @@ -26508,51 +26508,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), - ty: DeclarationId(2020), + ty: DeclarationId(2022), }, Field { label: "Var".to_string(), - ty: DeclarationId(2021), + ty: DeclarationId(2023), }, Field { label: "Path".to_string(), - ty: DeclarationId(2024), + ty: DeclarationId(2026), }, Field { label: "Call".to_string(), - ty: DeclarationId(2026), + ty: DeclarationId(2028), }, Field { label: "VariantRecord".to_string(), - ty: DeclarationId(2028), + ty: DeclarationId(2030), }, Field { label: "Operator".to_string(), - ty: DeclarationId(2030), + ty: DeclarationId(2032), }, Field { label: "Lambda".to_string(), - ty: DeclarationId(2032), + ty: DeclarationId(2034), }, Field { label: "If".to_string(), - ty: DeclarationId(2033), + ty: DeclarationId(2035), }, Field { label: "Match".to_string(), - ty: DeclarationId(2035), + ty: DeclarationId(2037), }, Field { label: "Record".to_string(), - ty: DeclarationId(2037), + ty: DeclarationId(2039), }, Field { label: "List".to_string(), - ty: DeclarationId(2039), + ty: DeclarationId(2041), }, Field { label: "Map".to_string(), - ty: DeclarationId(2041), + ty: DeclarationId(2043), }, ], }, @@ -26573,43 +26573,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Let".to_string(), - ty: DeclarationId(2043), + ty: DeclarationId(2045), }, Field { label: "Fn".to_string(), - ty: DeclarationId(2046), + ty: DeclarationId(2048), }, Field { label: "FnExternalBody".to_string(), - ty: DeclarationId(2049), + ty: DeclarationId(2051), }, Field { label: "Data".to_string(), - ty: DeclarationId(2051), + ty: DeclarationId(2053), }, Field { label: "Module".to_string(), - ty: DeclarationId(2053), + ty: DeclarationId(2055), }, Field { label: "Import".to_string(), - ty: DeclarationId(2056), + ty: DeclarationId(2058), }, Field { label: "TypeAtom".to_string(), - ty: DeclarationId(2058), + ty: DeclarationId(2060), }, Field { label: "TypeRecord".to_string(), - ty: DeclarationId(2061), + ty: DeclarationId(2063), }, Field { label: "TypeSum".to_string(), - ty: DeclarationId(2065), + ty: DeclarationId(2067), }, Field { label: "TypeAlias".to_string(), - ty: DeclarationId(2068), + ty: DeclarationId(2070), }, ], }, @@ -26635,7 +26635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2069)), + meta_tag: Some(DeclarationId(2071)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -26654,7 +26654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -26667,7 +26667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26687,7 +26687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -26700,7 +26700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26720,7 +26720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -26733,7 +26733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26755,7 +26755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -26768,7 +26768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26790,7 +26790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -26803,7 +26803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26825,7 +26825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -26838,7 +26838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26860,7 +26860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -26873,7 +26873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26893,7 +26893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + {arg}".to_string(), ))], @@ -26906,7 +26906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26928,7 +26928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[{arg}(x) for x in {recv}]".to_string(), ))], @@ -26941,7 +26941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26963,7 +26963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -26976,7 +26976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -26998,7 +26998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -27011,7 +27011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27033,7 +27033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -27046,7 +27046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27068,7 +27068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -27081,7 +27081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27101,7 +27101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -27114,7 +27114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27134,7 +27134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -27147,7 +27147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27169,7 +27169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "functools.reduce({arg}, {recv})".to_string(), ))], @@ -27182,7 +27182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27204,7 +27204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -27217,7 +27217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27237,7 +27237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { - constructor: DeclarationId(1950), + constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -27250,7 +27250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -27303,7 +27303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "target".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -27348,23 +27348,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralValue".to_string(), - ty: DeclarationId(2070), + ty: DeclarationId(2072), }, Field { label: "RecordValue".to_string(), - ty: DeclarationId(2072), + ty: DeclarationId(2074), }, Field { label: "VariantValue".to_string(), - ty: DeclarationId(2073), + ty: DeclarationId(2075), }, Field { label: "NodeRef".to_string(), - ty: DeclarationId(2074), + ty: DeclarationId(2076), }, Field { label: "CardinalityValue".to_string(), - ty: DeclarationId(2075), + ty: DeclarationId(2077), }, ], }, @@ -27417,7 +27417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "bindings".to_string(), - ty: DeclarationId(2076), + ty: DeclarationId(2078), }], }, type_params: vec![], @@ -27436,7 +27436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "frames".to_string(), - ty: DeclarationId(2077), + ty: DeclarationId(2079), }], }, type_params: vec![], @@ -27447,15 +27447,34 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 4548, 4597), + span: SourceSpan::new("src/v3/std/runtime.dag", 4505, 4554), }); declarations.push(Declaration { id: DeclarationId(1021), + name: Some("EvalStateKey".to_string()), + connective: TypeConnective::Conj { + children: vec![Field { + label: "state".to_string(), + ty: DeclarationId(1020), + }], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/runtime.dag", 4935, 4980), + }); + declarations.push(Declaration { + id: DeclarationId(1022), name: Some("EvalStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "ApplicativeOrder".to_string(), - ty: DeclarationId(2078), + ty: DeclarationId(2080), }], }, type_params: vec![], @@ -27466,15 +27485,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5002, 5076), + span: SourceSpan::new("src/v3/std/runtime.dag", 5385, 5459), }); declarations.push(Declaration { - id: DeclarationId(1022), + id: DeclarationId(1023), name: Some("InputEvaluationOrder".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "LeftFirst".to_string(), - ty: DeclarationId(2079), + ty: DeclarationId(2081), }], }, type_params: vec![], @@ -27485,11 +27504,44 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5313, 5350), + span: SourceSpan::new("src/v3/std/runtime.dag", 5696, 5733), }); - declarations.push(Declaration { id: DeclarationId(1023), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2080)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1950), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1949), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); declarations.push(Declaration { id: DeclarationId(1024), + name: Some("EvalMemoKey".to_string()), + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "program".to_string(), + ty: DeclarationId(642), + }, + Field { + label: "node".to_string(), + ty: DeclarationId(640), + }, + Field { + label: "state_key".to_string(), + ty: DeclarationId(1021), + }, + Field { + label: "strategy".to_string(), + ty: DeclarationId(1022), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153), + }); + declarations.push(Declaration { id: DeclarationId(1025), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2082)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1953), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1952), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1951), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); + declarations.push(Declaration { + id: DeclarationId(1026), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -27503,7 +27555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704), }); declarations.push(Declaration { - id: DeclarationId(1025), + id: DeclarationId(1027), name: Some("RestEndpointBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -27528,12 +27580,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 4653, 4725), }); declarations.push(Declaration { - id: DeclarationId(1026), + id: DeclarationId(1028), name: Some("CallableRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -27547,21 +27599,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 5533, 5576), }); declarations.push(Declaration { - id: DeclarationId(1027), + id: DeclarationId(1029), name: Some("Operation".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "callable".to_string(), - ty: DeclarationId(1026), + ty: DeclarationId(1028), }, Field { label: "inputs".to_string(), - ty: DeclarationId(2081), + ty: DeclarationId(2083), }, Field { label: "endpoint".to_string(), - ty: DeclarationId(1025), + ty: DeclarationId(1027), }, ], }, @@ -27576,21 +27628,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6785, 6895), }); declarations.push(Declaration { - id: DeclarationId(1028), + id: DeclarationId(1030), name: Some("DescentEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Strict".to_string(), - ty: DeclarationId(2089), + ty: DeclarationId(2091), }, Field { label: "NonIncreasing".to_string(), - ty: DeclarationId(2090), + ty: DeclarationId(2092), }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2091), + ty: DeclarationId(2093), }, ], }, @@ -27605,10 +27657,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 642, 710), }); declarations.push(Declaration { - id: DeclarationId(1029), + id: DeclarationId(1031), name: Some("evidence_rank".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028)], + inputs: vec![DeclarationId(1030)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)), }, @@ -27623,11 +27675,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 712, 838), }); declarations.push(Declaration { - id: DeclarationId(1030), + id: DeclarationId(1032), name: Some("merge_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028), DeclarationId(1028)], - output: DeclarationId(1028), + inputs: vec![DeclarationId(1030), DeclarationId(1030)], + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)), }, type_params: vec![], @@ -27641,11 +27693,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 905, 1310), }); declarations.push(Declaration { - id: DeclarationId(1031), + id: DeclarationId(1033), name: Some("join_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028), DeclarationId(1028)], - output: DeclarationId(1028), + inputs: vec![DeclarationId(1030), DeclarationId(1030)], + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1456, @@ -27663,11 +27715,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 1380, 1655), }); declarations.push(Declaration { - id: DeclarationId(1032), + id: DeclarationId(1034), name: Some("promote_to_strict".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1028)], - output: DeclarationId(1028), + inputs: vec![DeclarationId(1030)], + output: DeclarationId(1030), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2117, @@ -27685,11 +27737,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2050, 2236), }); declarations.push(Declaration { - id: DeclarationId(1033), + id: DeclarationId(1035), name: Some("optional_evidence_meet".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2082), DeclarationId(2083)], - output: DeclarationId(2084), + inputs: vec![DeclarationId(2084), DeclarationId(2085)], + output: DeclarationId(2086), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2388, @@ -27707,11 +27759,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2300, 2564), }); declarations.push(Declaration { - id: DeclarationId(1034), + id: DeclarationId(1036), name: Some("map_evidence_merge_at".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2085), DeclarationId(197), DeclarationId(1028)], - output: DeclarationId(2086), + inputs: vec![DeclarationId(2087), DeclarationId(197), DeclarationId(1030)], + output: DeclarationId(2088), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2733, @@ -27729,29 +27781,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2601, 2907), }); declarations.push(Declaration { - id: DeclarationId(1035), + id: DeclarationId(1037), name: Some("RankingDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeSize".to_string(), - ty: DeclarationId(2092), + ty: DeclarationId(2094), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(2093), + ty: DeclarationId(2095), }, Field { label: "ArithmeticValue".to_string(), - ty: DeclarationId(2094), + ty: DeclarationId(2096), }, Field { label: "TokenPosition".to_string(), - ty: DeclarationId(2095), + ty: DeclarationId(2097), }, Field { label: "SetCardinality".to_string(), - ty: DeclarationId(2096), + ty: DeclarationId(2098), }, ], }, @@ -27766,17 +27818,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3206, 3402), }); declarations.push(Declaration { - id: DeclarationId(1036), + id: DeclarationId(1038), name: Some("PositiveDescentAmount".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OneStep".to_string(), - ty: DeclarationId(2097), + ty: DeclarationId(2099), }, Field { label: "AdditionalStep".to_string(), - ty: DeclarationId(2098), + ty: DeclarationId(2100), }, ], }, @@ -27791,17 +27843,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4378, 4471), }); declarations.push(Declaration { - id: DeclarationId(1037), + id: DeclarationId(1039), name: Some("ProportionalDivisor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DivideByTwo".to_string(), - ty: DeclarationId(2099), + ty: DeclarationId(2101), }, Field { label: "StrictlyLarger".to_string(), - ty: DeclarationId(2100), + ty: DeclarationId(2102), }, ], }, @@ -27816,10 +27868,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4937, 5027), }); declarations.push(Declaration { - id: DeclarationId(1038), + id: DeclarationId(1040), name: Some("proportional_divisor_to_int".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1037)], + inputs: vec![DeclarationId(1039)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -27838,7 +27890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5029, 5204), }); declarations.push(Declaration { - id: DeclarationId(1039), + id: DeclarationId(1041), name: Some("peano_literal_materialization_cap".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -27860,11 +27912,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5388, 5441), }); declarations.push(Declaration { - id: DeclarationId(1040), + id: DeclarationId(1042), name: Some("positive_descent_amount_from_positive_int".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(2087), + output: DeclarationId(2089), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 5902, @@ -27882,11 +27934,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5823, 6262), }); declarations.push(Declaration { - id: DeclarationId(1041), + id: DeclarationId(1043), name: Some("proportional_divisor_from_int_at_least_two".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(2088), + output: DeclarationId(2090), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6342, @@ -27904,37 +27956,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6264, 6703), }); declarations.push(Declaration { - id: DeclarationId(1042), + id: DeclarationId(1044), name: Some("DescentSource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessor".to_string(), - ty: DeclarationId(2101), + ty: DeclarationId(2103), }, Field { label: "ListShrink".to_string(), - ty: DeclarationId(2102), + ty: DeclarationId(2104), }, Field { label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2103), + ty: DeclarationId(2105), }, Field { label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2104), + ty: DeclarationId(2106), }, Field { label: "ParserAdvance".to_string(), - ty: DeclarationId(2105), + ty: DeclarationId(2107), }, Field { label: "SetRemoval".to_string(), - ty: DeclarationId(2106), + ty: DeclarationId(2108), }, Field { label: "FoldIteration".to_string(), - ty: DeclarationId(2107), + ty: DeclarationId(2109), }, ], }, @@ -27949,12 +28001,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7108, 7429), }); declarations.push(Declaration { - id: DeclarationId(1043), + id: DeclarationId(1045), name: Some("TerminationProof".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "dimensions".to_string(), - ty: DeclarationId(2108), + ty: DeclarationId(2110), }], }, type_params: vec![], @@ -27968,7 +28020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7431, 7493), }); declarations.push(Declaration { - id: DeclarationId(1044), + id: DeclarationId(1046), name: Some("ProofEdge".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -27982,7 +28034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), - ty: DeclarationId(2109), + ty: DeclarationId(2111), }, ], }, @@ -27997,193 +28049,193 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7638, 7724), }); declarations.push(Declaration { - id: DeclarationId(1045), + id: DeclarationId(1047), name: Some("TokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), - ty: DeclarationId(2110), + ty: DeclarationId(2112), }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2111), + ty: DeclarationId(2113), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2112), + ty: DeclarationId(2114), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2113), + ty: DeclarationId(2115), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2114), + ty: DeclarationId(2116), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2115), + ty: DeclarationId(2117), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2116), + ty: DeclarationId(2118), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2117), + ty: DeclarationId(2119), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2118), + ty: DeclarationId(2120), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2119), + ty: DeclarationId(2121), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2122), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2121), + ty: DeclarationId(2123), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2122), + ty: DeclarationId(2124), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2123), + ty: DeclarationId(2125), }, Field { label: "Ident".to_string(), - ty: DeclarationId(2124), + ty: DeclarationId(2126), }, Field { label: "IntLit".to_string(), - ty: DeclarationId(2125), + ty: DeclarationId(2127), }, Field { label: "StringLit".to_string(), - ty: DeclarationId(2126), + ty: DeclarationId(2128), }, Field { label: "Eq".to_string(), - ty: DeclarationId(2127), + ty: DeclarationId(2129), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2128), + ty: DeclarationId(2130), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2129), + ty: DeclarationId(2131), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2130), + ty: DeclarationId(2132), }, Field { label: "Le".to_string(), - ty: DeclarationId(2131), + ty: DeclarationId(2133), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2132), + ty: DeclarationId(2134), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2133), + ty: DeclarationId(2135), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2134), + ty: DeclarationId(2136), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2135), + ty: DeclarationId(2137), }, Field { label: "Star".to_string(), - ty: DeclarationId(2136), + ty: DeclarationId(2138), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2137), + ty: DeclarationId(2139), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2138), + ty: DeclarationId(2140), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2139), + ty: DeclarationId(2141), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2140), + ty: DeclarationId(2142), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2141), + ty: DeclarationId(2143), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2142), + ty: DeclarationId(2144), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2143), + ty: DeclarationId(2145), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2144), + ty: DeclarationId(2146), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2145), + ty: DeclarationId(2147), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2146), + ty: DeclarationId(2148), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2147), + ty: DeclarationId(2149), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2148), + ty: DeclarationId(2150), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2149), + ty: DeclarationId(2151), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2150), + ty: DeclarationId(2152), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2151), + ty: DeclarationId(2153), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2152), + ty: DeclarationId(2154), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2153), + ty: DeclarationId(2155), }, Field { label: "Question".to_string(), - ty: DeclarationId(2154), + ty: DeclarationId(2156), }, Field { label: "Eof".to_string(), - ty: DeclarationId(2155), + ty: DeclarationId(2157), }, ], }, @@ -28198,13 +28250,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1151), }); declarations.push(Declaration { - id: DeclarationId(1046), + id: DeclarationId(1048), name: Some("Token".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1045), + ty: DeclarationId(1047), }, Field { label: "span".to_string(), @@ -28223,65 +28275,65 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1286, 1337), }); declarations.push(Declaration { - id: DeclarationId(1047), + id: DeclarationId(1049), name: Some("KeywordTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), - ty: DeclarationId(2156), + ty: DeclarationId(2158), }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2157), + ty: DeclarationId(2159), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2158), + ty: DeclarationId(2160), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2159), + ty: DeclarationId(2161), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2160), + ty: DeclarationId(2162), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2161), + ty: DeclarationId(2163), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2162), + ty: DeclarationId(2164), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2163), + ty: DeclarationId(2165), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2164), + ty: DeclarationId(2166), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2165), + ty: DeclarationId(2167), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2166), + ty: DeclarationId(2168), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2167), + ty: DeclarationId(2169), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2168), + ty: DeclarationId(2170), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2169), + ty: DeclarationId(2171), }, ], }, @@ -28296,121 +28348,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1696, 1876), }); declarations.push(Declaration { - id: DeclarationId(1048), + id: DeclarationId(1050), name: Some("PunctTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Eq".to_string(), - ty: DeclarationId(2170), + ty: DeclarationId(2172), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2171), + ty: DeclarationId(2173), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2172), + ty: DeclarationId(2174), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2173), + ty: DeclarationId(2175), }, Field { label: "Le".to_string(), - ty: DeclarationId(2174), + ty: DeclarationId(2176), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2175), + ty: DeclarationId(2177), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2176), + ty: DeclarationId(2178), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2177), + ty: DeclarationId(2179), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2178), + ty: DeclarationId(2180), }, Field { label: "Star".to_string(), - ty: DeclarationId(2179), + ty: DeclarationId(2181), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2180), + ty: DeclarationId(2182), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2181), + ty: DeclarationId(2183), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2182), + ty: DeclarationId(2184), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2183), + ty: DeclarationId(2185), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2184), + ty: DeclarationId(2186), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2185), + ty: DeclarationId(2187), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2186), + ty: DeclarationId(2188), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2187), + ty: DeclarationId(2189), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2188), + ty: DeclarationId(2190), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2189), + ty: DeclarationId(2191), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2190), + ty: DeclarationId(2192), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2191), + ty: DeclarationId(2193), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2192), + ty: DeclarationId(2194), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2193), + ty: DeclarationId(2195), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2194), + ty: DeclarationId(2196), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2195), + ty: DeclarationId(2197), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2196), + ty: DeclarationId(2198), }, Field { label: "Question".to_string(), - ty: DeclarationId(2197), + ty: DeclarationId(2199), }, ], }, @@ -28425,7 +28477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2292, 2598), }); declarations.push(Declaration { - id: DeclarationId(1049), + id: DeclarationId(1051), name: Some("LocalPunctSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28435,7 +28487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "kind".to_string(), - ty: DeclarationId(1048), + ty: DeclarationId(1050), }, ], }, @@ -28450,7 +28502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2808, 2872), }); declarations.push(Declaration { - id: DeclarationId(1050), + id: DeclarationId(1052), name: Some("StringEscapeSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28475,7 +28527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 3259, 3325), }); declarations.push(Declaration { - id: DeclarationId(1051), + id: DeclarationId(1053), name: Some("Path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(131), @@ -28492,7 +28544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360), }); declarations.push(Declaration { - id: DeclarationId(1052), + id: DeclarationId(1054), name: Some("SnapshotRef".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(122), @@ -28509,7 +28561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391), }); declarations.push(Declaration { - id: DeclarationId(1053), + id: DeclarationId(1055), name: Some("CensusListConstant".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28523,15 +28575,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554), }); declarations.push(Declaration { - id: DeclarationId(1054), + id: DeclarationId(1056), name: Some("expected_hand_authored_non_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1053), + template: DeclarationId(1055), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1053)), + meta_tag: Some(DeclarationId(1055)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28540,15 +28592,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617), }); declarations.push(Declaration { - id: DeclarationId(1055), + id: DeclarationId(1057), name: Some("expected_hand_authored_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1053), + template: DeclarationId(1055), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1053)), + meta_tag: Some(DeclarationId(1055)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28557,7 +28609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675), }); declarations.push(Declaration { - id: DeclarationId(1056), + id: DeclarationId(1058), name: Some("LensProducerFilesSubsetPredicate".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28571,15 +28623,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847), }); declarations.push(Declaration { - id: DeclarationId(1057), + id: DeclarationId(1059), name: Some("lens_producer_files_subset_predicate".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1056), + template: DeclarationId(1058), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1056)), + meta_tag: Some(DeclarationId(1058)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28588,7 +28640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929), }); declarations.push(Declaration { - id: DeclarationId(1058), + id: DeclarationId(1060), name: Some("CompilerStdPositiveSetRatchet".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28602,15 +28654,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045), }); declarations.push(Declaration { - id: DeclarationId(1059), + id: DeclarationId(1061), name: Some("compiler_std_positive_set_ratchet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1058), + template: DeclarationId(1060), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1058)), + meta_tag: Some(DeclarationId(1060)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -28619,37 +28671,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121), }); declarations.push(Declaration { - id: DeclarationId(1060), + id: DeclarationId(1062), name: Some("DiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), - ty: DeclarationId(2201), + ty: DeclarationId(2203), }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2202), + ty: DeclarationId(2204), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2203), + ty: DeclarationId(2205), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2204), + ty: DeclarationId(2206), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2205), + ty: DeclarationId(2207), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2206), + ty: DeclarationId(2208), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2207), + ty: DeclarationId(2209), }, ], }, @@ -28664,17 +28716,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606), }); declarations.push(Declaration { - id: DeclarationId(1061), + id: DeclarationId(1063), name: Some("DiagnosticDetailExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnyDetail".to_string(), - ty: DeclarationId(2208), + ty: DeclarationId(2210), }, Field { label: "Contains".to_string(), - ty: DeclarationId(2209), + ty: DeclarationId(2211), }, ], }, @@ -28689,17 +28741,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042), }); declarations.push(Declaration { - id: DeclarationId(1062), + id: DeclarationId(1064), name: Some("DiagnosticReference".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), - ty: DeclarationId(1060), + ty: DeclarationId(1062), }, Field { label: "detail_contains".to_string(), - ty: DeclarationId(1061), + ty: DeclarationId(1063), }, ], }, @@ -28714,17 +28766,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284), }); declarations.push(Declaration { - id: DeclarationId(1063), + id: DeclarationId(1065), name: Some("PortStateExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Resolved".to_string(), - ty: DeclarationId(2210), + ty: DeclarationId(2212), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(2211), + ty: DeclarationId(2213), }, ], }, @@ -28739,21 +28791,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724), }); declarations.push(Declaration { - id: DeclarationId(1064), + id: DeclarationId(1066), name: Some("AlgebraicLawKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Associativity".to_string(), - ty: DeclarationId(2212), + ty: DeclarationId(2214), }, Field { label: "Commutativity".to_string(), - ty: DeclarationId(2213), + ty: DeclarationId(2215), }, Field { label: "Identity".to_string(), - ty: DeclarationId(2214), + ty: DeclarationId(2216), }, ], }, @@ -28768,97 +28820,97 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583), }); declarations.push(Declaration { - id: DeclarationId(1065), + id: DeclarationId(1067), name: Some("TestPredicate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Compiles".to_string(), - ty: DeclarationId(2215), + ty: DeclarationId(2217), }, Field { label: "FailsWithDiagnostic".to_string(), - ty: DeclarationId(2216), + ty: DeclarationId(2218), }, Field { label: "OutputEquals".to_string(), - ty: DeclarationId(2217), + ty: DeclarationId(2219), }, Field { label: "PortHasState".to_string(), - ty: DeclarationId(2218), + ty: DeclarationId(2220), }, Field { label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2219), + ty: DeclarationId(2221), }, Field { label: "CostBounded".to_string(), - ty: DeclarationId(2220), + ty: DeclarationId(2222), }, Field { label: "BehavioralObservation".to_string(), - ty: DeclarationId(2221), + ty: DeclarationId(2223), }, Field { label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2222), + ty: DeclarationId(2224), }, Field { label: "ExecuteCommand".to_string(), - ty: DeclarationId(2224), + ty: DeclarationId(2226), }, Field { label: "ForAllTargets".to_string(), - ty: DeclarationId(2226), + ty: DeclarationId(2228), }, Field { label: "LensOutputEquals".to_string(), - ty: DeclarationId(2227), + ty: DeclarationId(2229), }, Field { label: "DifferentialEquals".to_string(), - ty: DeclarationId(2228), + ty: DeclarationId(2230), }, Field { label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2229), + ty: DeclarationId(2231), }, Field { label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2230), + ty: DeclarationId(2232), }, Field { label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2231), + ty: DeclarationId(2233), }, Field { label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2232), + ty: DeclarationId(2234), }, Field { label: "FixedPointConverges".to_string(), - ty: DeclarationId(2233), + ty: DeclarationId(2235), }, Field { label: "RatchetZero".to_string(), - ty: DeclarationId(2234), + ty: DeclarationId(2236), }, Field { label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2236), + ty: DeclarationId(2238), }, Field { label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2237), + ty: DeclarationId(2239), }, Field { label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2238), + ty: DeclarationId(2240), }, Field { label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2239), + ty: DeclarationId(2241), }, ], }, @@ -28873,7 +28925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4585, 12806), }); declarations.push(Declaration { - id: DeclarationId(1066), + id: DeclarationId(1068), name: Some("ProgramInput".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -28887,12 +28939,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12914, 12934), }); declarations.push(Declaration { - id: DeclarationId(1067), + id: DeclarationId(1069), name: Some("ProgramOutputBind".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "output_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }], }, type_params: vec![], @@ -28906,7 +28958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13077, 13132), }); declarations.push(Declaration { - id: DeclarationId(1068), + id: DeclarationId(1070), name: Some("TestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28924,11 +28976,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "predicate".to_string(), - ty: DeclarationId(1065), + ty: DeclarationId(1067), }, Field { label: "requires".to_string(), - ty: DeclarationId(2240), + ty: DeclarationId(2242), }, ], }, @@ -28943,7 +28995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13742, 13875), }); declarations.push(Declaration { - id: DeclarationId(1069), + id: DeclarationId(1071), name: Some("TestSuite".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28953,7 +29005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "claims".to_string(), - ty: DeclarationId(2241), + ty: DeclarationId(2243), }, ], }, @@ -28968,7 +29020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13877, 13936), }); declarations.push(Declaration { - id: DeclarationId(1070), + id: DeclarationId(1072), name: Some("TestObligation".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -28978,7 +29030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "resources".to_string(), - ty: DeclarationId(2242), + ty: DeclarationId(2244), }, ], }, @@ -28993,11 +29045,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14134, 14215), }); declarations.push(Declaration { - id: DeclarationId(1071), + id: DeclarationId(1073), name: Some("claim_obligation_resources".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1068)], - output: DeclarationId(2198), + inputs: vec![DeclarationId(1070)], + output: DeclarationId(2200), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14657, @@ -29015,11 +29067,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14586, 14673), }); declarations.push(Declaration { - id: DeclarationId(1072), + id: DeclarationId(1074), name: Some("obligation_for_claim".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1068)], - output: DeclarationId(1070), + inputs: vec![DeclarationId(1070)], + output: DeclarationId(1072), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14731, @@ -29037,11 +29089,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14675, 14816), }); declarations.push(Declaration { - id: DeclarationId(1073), + id: DeclarationId(1075), name: Some("materialize_test_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2199)], - output: DeclarationId(2200), + inputs: vec![DeclarationId(2201)], + output: DeclarationId(2202), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14899, @@ -29059,11 +29111,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14818, 14938), }); declarations.push(Declaration { - id: DeclarationId(1074), + id: DeclarationId(1076), name: Some("behavior_spine".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], - output: DeclarationId(2243), + output: DeclarationId(2245), body: ArrowBody::UserDefined(NodeId(240)), }, type_params: vec![], @@ -29077,7 +29129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018), }); declarations.push(Declaration { - id: DeclarationId(1075), + id: DeclarationId(1077), name: Some("ValueBehavior".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29091,7 +29143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956), }); declarations.push(Declaration { - id: DeclarationId(1076), + id: DeclarationId(1078), name: Some("Transform".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29105,7 +29157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974), }); declarations.push(Declaration { - id: DeclarationId(1077), + id: DeclarationId(1079), name: Some("Branch".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29119,7 +29171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989), }); declarations.push(Declaration { - id: DeclarationId(1078), + id: DeclarationId(1080), name: Some("Loop".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29133,7 +29185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002), }); declarations.push(Declaration { - id: DeclarationId(1079), + id: DeclarationId(1081), name: Some("Bind".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29147,7 +29199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015), }); declarations.push(Declaration { - id: DeclarationId(1080), + id: DeclarationId(1082), name: Some("Main".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29161,7 +29213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028), }); declarations.push(Declaration { - id: DeclarationId(1081), + id: DeclarationId(1083), name: Some("DeclarationRef".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -29175,7 +29227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783), }); declarations.push(Declaration { - id: DeclarationId(1082), + id: DeclarationId(1084), name: Some("go_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(853), @@ -29191,14 +29243,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(1859), + constructor: DeclarationId(1861), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1864), payload: vec![], }, ), @@ -29209,7 +29261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1630, 1732), }); declarations.push(Declaration { - id: DeclarationId(1083), + id: DeclarationId(1085), name: Some("go_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(855), @@ -29239,7 +29291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1734, 1884), }); declarations.push(Declaration { - id: DeclarationId(1084), + id: DeclarationId(1086), name: Some("go_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -29260,7 +29312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1886, 1961), }); declarations.push(Declaration { - id: DeclarationId(1085), + id: DeclarationId(1087), name: Some("go_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29275,7 +29327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29298,7 +29350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1963, 2093), }); declarations.push(Declaration { - id: DeclarationId(1086), + id: DeclarationId(1088), name: Some("go_int32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29313,7 +29365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29336,7 +29388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2095, 2229), }); declarations.push(Declaration { - id: DeclarationId(1087), + id: DeclarationId(1089), name: Some("go_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -29351,7 +29403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "kernel_integer".to_string(), @@ -29364,15 +29416,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -29384,7 +29436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1086)), + FieldValue::Reference(DeclarationId(1088)), ), ], }), @@ -29393,7 +29445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2231, 2534), }); declarations.push(Declaration { - id: DeclarationId(1088), + id: DeclarationId(1090), name: Some("go_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29408,7 +29460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29431,7 +29483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2536, 2667), }); declarations.push(Declaration { - id: DeclarationId(1089), + id: DeclarationId(1091), name: Some("go_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29446,7 +29498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29469,7 +29521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2669, 2806), }); declarations.push(Declaration { - id: DeclarationId(1090), + id: DeclarationId(1092), name: Some("go_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29484,7 +29536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29507,7 +29559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2808, 2946), }); declarations.push(Declaration { - id: DeclarationId(1091), + id: DeclarationId(1093), name: Some("go_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29522,7 +29574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29545,7 +29597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2948, 3086), }); declarations.push(Declaration { - id: DeclarationId(1092), + id: DeclarationId(1094), name: Some("go_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29560,7 +29612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29583,7 +29635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3088, 3247), }); declarations.push(Declaration { - id: DeclarationId(1093), + id: DeclarationId(1095), name: Some("go_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29598,7 +29650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29621,7 +29673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3249, 3396), }); declarations.push(Declaration { - id: DeclarationId(1094), + id: DeclarationId(1096), name: Some("go_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29636,7 +29688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29660,7 +29712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -29680,7 +29732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3398, 3639), }); declarations.push(Declaration { - id: DeclarationId(1095), + id: DeclarationId(1097), name: Some("go_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29695,7 +29747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29718,7 +29770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3641, 3789), }); declarations.push(Declaration { - id: DeclarationId(1096), + id: DeclarationId(1098), name: Some("go_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29733,7 +29785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29758,7 +29810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -29777,7 +29829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -29798,7 +29850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -29819,7 +29871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3791, 4174), }); declarations.push(Declaration { - id: DeclarationId(1097), + id: DeclarationId(1099), name: Some("go_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29834,7 +29886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29859,7 +29911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -29878,7 +29930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -29897,7 +29949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -29918,7 +29970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4176, 4570), }); declarations.push(Declaration { - id: DeclarationId(1098), + id: DeclarationId(1100), name: Some("go_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29933,7 +29985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29956,7 +30008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4572, 4726), }); declarations.push(Declaration { - id: DeclarationId(1099), + id: DeclarationId(1101), name: Some("go_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -29971,7 +30023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -29994,7 +30046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4728, 4882), }); declarations.push(Declaration { - id: DeclarationId(1100), + id: DeclarationId(1102), name: Some("go_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30009,7 +30061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30032,7 +30084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4884, 5053), }); declarations.push(Declaration { - id: DeclarationId(1101), + id: DeclarationId(1103), name: Some("go_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30047,7 +30099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30070,7 +30122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5055, 5199), }); declarations.push(Declaration { - id: DeclarationId(1102), + id: DeclarationId(1104), name: Some("go_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30085,7 +30137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30110,7 +30162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5201, 5386), }); declarations.push(Declaration { - id: DeclarationId(1103), + id: DeclarationId(1105), name: Some("go_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30125,7 +30177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30148,7 +30200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5388, 5548), }); declarations.push(Declaration { - id: DeclarationId(1104), + id: DeclarationId(1106), name: Some("go_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30163,7 +30215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30188,7 +30240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -30207,7 +30259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -30228,7 +30280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5550, 5852), }); declarations.push(Declaration { - id: DeclarationId(1105), + id: DeclarationId(1107), name: Some("go_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30243,7 +30295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30270,7 +30322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -30289,7 +30341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -30310,7 +30362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5854, 6191), }); declarations.push(Declaration { - id: DeclarationId(1106), + id: DeclarationId(1108), name: Some("go_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30325,7 +30377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30352,7 +30404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -30371,7 +30423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -30392,7 +30444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6193, 6534), }); declarations.push(Declaration { - id: DeclarationId(1107), + id: DeclarationId(1109), name: Some("go_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30407,7 +30459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30433,7 +30485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -30453,7 +30505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6536, 6808), }); declarations.push(Declaration { - id: DeclarationId(1108), + id: DeclarationId(1110), name: Some("go_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30468,7 +30520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30493,7 +30545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -30512,7 +30564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -30533,7 +30585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6810, 7121), }); declarations.push(Declaration { - id: DeclarationId(1109), + id: DeclarationId(1111), name: Some("go_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30548,7 +30600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30573,7 +30625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -30592,7 +30644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -30613,7 +30665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7123, 7439), }); declarations.push(Declaration { - id: DeclarationId(1110), + id: DeclarationId(1112), name: Some("go_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30628,7 +30680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30653,7 +30705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -30672,7 +30724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -30691,7 +30743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -30712,7 +30764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7441, 7850), }); declarations.push(Declaration { - id: DeclarationId(1111), + id: DeclarationId(1113), name: Some("go_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30727,7 +30779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30752,7 +30804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -30771,7 +30823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -30792,7 +30844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7852, 8168), }); declarations.push(Declaration { - id: DeclarationId(1112), + id: DeclarationId(1114), name: Some("go_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30807,7 +30859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30831,7 +30883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -30851,7 +30903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8170, 8411), }); declarations.push(Declaration { - id: DeclarationId(1113), + id: DeclarationId(1115), name: Some("go_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30866,7 +30918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30890,7 +30942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -30910,7 +30962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8413, 8654), }); declarations.push(Declaration { - id: DeclarationId(1114), + id: DeclarationId(1116), name: Some("go_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30925,7 +30977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -30949,7 +31001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -30969,7 +31021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8656, 8915), }); declarations.push(Declaration { - id: DeclarationId(1115), + id: DeclarationId(1117), name: Some("go_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -30984,7 +31036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31009,7 +31061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -31030,7 +31082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -31051,7 +31103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8917, 9250), }); declarations.push(Declaration { - id: DeclarationId(1116), + id: DeclarationId(1118), name: Some("go_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31066,7 +31118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31089,7 +31141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9252, 9403), }); declarations.push(Declaration { - id: DeclarationId(1117), + id: DeclarationId(1119), name: Some("go_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31104,7 +31156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31127,7 +31179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9405, 9553), }); declarations.push(Declaration { - id: DeclarationId(1118), + id: DeclarationId(1120), name: Some("go_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31142,7 +31194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31165,7 +31217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9555, 9703), }); declarations.push(Declaration { - id: DeclarationId(1119), + id: DeclarationId(1121), name: Some("go_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31180,7 +31232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31203,7 +31255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9705, 9868), }); declarations.push(Declaration { - id: DeclarationId(1120), + id: DeclarationId(1122), name: Some("go_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31218,7 +31270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31243,7 +31295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -31262,7 +31314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -31283,7 +31335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -31304,7 +31356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -31325,7 +31377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -31346,7 +31398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -31367,7 +31419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -31388,7 +31440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -31409,7 +31461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -31428,7 +31480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -31449,7 +31501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9870, 10887), }); declarations.push(Declaration { - id: DeclarationId(1121), + id: DeclarationId(1123), name: Some("go_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31464,7 +31516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31487,7 +31539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10889, 11046), }); declarations.push(Declaration { - id: DeclarationId(1122), + id: DeclarationId(1124), name: Some("go_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31502,7 +31554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31525,7 +31577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11048, 11205), }); declarations.push(Declaration { - id: DeclarationId(1123), + id: DeclarationId(1125), name: Some("go_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31540,7 +31592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31563,7 +31615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11207, 11355), }); declarations.push(Declaration { - id: DeclarationId(1124), + id: DeclarationId(1126), name: Some("go_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31578,7 +31630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31601,7 +31653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11357, 11514), }); declarations.push(Declaration { - id: DeclarationId(1125), + id: DeclarationId(1127), name: Some("go_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31616,7 +31668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31639,7 +31691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11516, 11682), }); declarations.push(Declaration { - id: DeclarationId(1126), + id: DeclarationId(1128), name: Some("go_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31654,7 +31706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31677,7 +31729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11684, 11844), }); declarations.push(Declaration { - id: DeclarationId(1127), + id: DeclarationId(1129), name: Some("go_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31692,7 +31744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31719,7 +31771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -31740,7 +31792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -31761,7 +31813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11846, 12197), }); declarations.push(Declaration { - id: DeclarationId(1128), + id: DeclarationId(1130), name: Some("go_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31776,7 +31828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31801,7 +31853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -31822,7 +31874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -31841,7 +31893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -31860,7 +31912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -31881,7 +31933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12199, 12686), }); declarations.push(Declaration { - id: DeclarationId(1129), + id: DeclarationId(1131), name: Some("go_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31896,7 +31948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31919,7 +31971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12688, 12836), }); declarations.push(Declaration { - id: DeclarationId(1130), + id: DeclarationId(1132), name: Some("go_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -31934,7 +31986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -31959,7 +32011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -31978,7 +32030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -31999,7 +32051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32018,7 +32070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32039,7 +32091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13310, 13784), }); declarations.push(Declaration { - id: DeclarationId(1131), + id: DeclarationId(1133), name: Some("go_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32054,7 +32106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32079,7 +32131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32098,7 +32150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -32117,7 +32169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -32138,7 +32190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32157,7 +32209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32178,7 +32230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13786, 14351), }); declarations.push(Declaration { - id: DeclarationId(1132), + id: DeclarationId(1134), name: Some("go_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32193,7 +32245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32218,7 +32270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32237,7 +32289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -32256,7 +32308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -32277,7 +32329,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32296,7 +32348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32317,7 +32369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -32338,7 +32390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 14353, 15010), }); declarations.push(Declaration { - id: DeclarationId(1133), + id: DeclarationId(1135), name: Some("go_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32353,7 +32405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32378,7 +32430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32397,7 +32449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -32416,7 +32468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -32435,7 +32487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -32454,7 +32506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -32475,7 +32527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32494,7 +32546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32515,7 +32567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15012, 15714), }); declarations.push(Declaration { - id: DeclarationId(1134), + id: DeclarationId(1136), name: Some("go_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32530,7 +32582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32555,7 +32607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -32574,7 +32626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -32595,7 +32647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -32614,7 +32666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -32633,7 +32685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -32654,7 +32706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -32675,7 +32727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15716, 16367), }); declarations.push(Declaration { - id: DeclarationId(1135), + id: DeclarationId(1137), name: Some("go_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32690,7 +32742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32713,7 +32765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16369, 16513), }); declarations.push(Declaration { - id: DeclarationId(1136), + id: DeclarationId(1138), name: Some("go_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32728,7 +32780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32755,7 +32807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -32774,7 +32826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -32793,7 +32845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -32814,7 +32866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -32835,7 +32887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16515, 16982), }); declarations.push(Declaration { - id: DeclarationId(1137), + id: DeclarationId(1139), name: Some("go_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32850,7 +32902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32874,7 +32926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -32894,7 +32946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17285, 17526), }); declarations.push(Declaration { - id: DeclarationId(1138), + id: DeclarationId(1140), name: Some("go_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32909,7 +32961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32932,7 +32984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17528, 17682), }); declarations.push(Declaration { - id: DeclarationId(1139), + id: DeclarationId(1141), name: Some("go_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -32947,7 +32999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -32972,7 +33024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -32991,7 +33043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -33012,7 +33064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -33033,7 +33085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17684, 18082), }); declarations.push(Declaration { - id: DeclarationId(1140), + id: DeclarationId(1142), name: Some("go_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33048,7 +33100,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33073,7 +33125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33092,7 +33144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -33113,7 +33165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18084, 18393), }); declarations.push(Declaration { - id: DeclarationId(1141), + id: DeclarationId(1143), name: Some("go_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33128,7 +33180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33153,7 +33205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33172,7 +33224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -33191,7 +33243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33212,7 +33264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18395, 18797), }); declarations.push(Declaration { - id: DeclarationId(1142), + id: DeclarationId(1144), name: Some("go_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33227,7 +33279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33250,7 +33302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18799, 18962), }); declarations.push(Declaration { - id: DeclarationId(1143), + id: DeclarationId(1145), name: Some("go_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33265,7 +33317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33288,7 +33340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18964, 19118), }); declarations.push(Declaration { - id: DeclarationId(1144), + id: DeclarationId(1146), name: Some("go_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33303,7 +33355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33328,7 +33380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33347,7 +33399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -33366,7 +33418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33387,7 +33439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19120, 19531), }); declarations.push(Declaration { - id: DeclarationId(1145), + id: DeclarationId(1147), name: Some("go_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33402,7 +33454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33427,7 +33479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -33448,7 +33500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -33467,7 +33519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -33486,7 +33538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33507,7 +33559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19533, 20018), }); declarations.push(Declaration { - id: DeclarationId(1146), + id: DeclarationId(1148), name: Some("go_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33522,7 +33574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33547,7 +33599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -33566,7 +33618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -33585,7 +33637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33606,7 +33658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20020, 20426), }); declarations.push(Declaration { - id: DeclarationId(1147), + id: DeclarationId(1149), name: Some("go_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33621,7 +33673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33646,7 +33698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -33665,7 +33717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -33684,7 +33736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -33705,7 +33757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20428, 20846), }); declarations.push(Declaration { - id: DeclarationId(1148), + id: DeclarationId(1150), name: Some("go_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33720,7 +33772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33743,7 +33795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20848, 21011), }); declarations.push(Declaration { - id: DeclarationId(1149), + id: DeclarationId(1151), name: Some("go_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33758,7 +33810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33781,7 +33833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21013, 21176), }); declarations.push(Declaration { - id: DeclarationId(1150), + id: DeclarationId(1152), name: Some("go_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -33796,7 +33848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33819,7 +33871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21178, 21332), }); declarations.push(Declaration { - id: DeclarationId(1151), + id: DeclarationId(1153), name: Some("go_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33834,7 +33886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33853,7 +33905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21334, 21475), }); declarations.push(Declaration { - id: DeclarationId(1152), + id: DeclarationId(1154), name: Some("go_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33868,7 +33920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33887,7 +33939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21477, 21618), }); declarations.push(Declaration { - id: DeclarationId(1153), + id: DeclarationId(1155), name: Some("go_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33902,7 +33954,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33921,7 +33973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21620, 21761), }); declarations.push(Declaration { - id: DeclarationId(1154), + id: DeclarationId(1156), name: Some("go_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33936,7 +33988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33957,7 +34009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21763, 21911), }); declarations.push(Declaration { - id: DeclarationId(1155), + id: DeclarationId(1157), name: Some("go_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33972,7 +34024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -33991,7 +34043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21913, 22053), }); declarations.push(Declaration { - id: DeclarationId(1156), + id: DeclarationId(1158), name: Some("go_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34006,7 +34058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34025,7 +34077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22055, 22202), }); declarations.push(Declaration { - id: DeclarationId(1157), + id: DeclarationId(1159), name: Some("go_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34040,7 +34092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34059,7 +34111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22204, 22351), }); declarations.push(Declaration { - id: DeclarationId(1158), + id: DeclarationId(1160), name: Some("go_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34074,7 +34126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34093,7 +34145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22353, 22514), }); declarations.push(Declaration { - id: DeclarationId(1159), + id: DeclarationId(1161), name: Some("go_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34108,7 +34160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34127,7 +34179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22516, 22656), }); declarations.push(Declaration { - id: DeclarationId(1160), + id: DeclarationId(1162), name: Some("go_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34142,7 +34194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34161,7 +34213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22658, 22805), }); declarations.push(Declaration { - id: DeclarationId(1161), + id: DeclarationId(1163), name: Some("go_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34176,7 +34228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34195,7 +34247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22807, 22954), }); declarations.push(Declaration { - id: DeclarationId(1162), + id: DeclarationId(1164), name: Some("go_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34210,7 +34262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34229,7 +34281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22956, 23117), }); declarations.push(Declaration { - id: DeclarationId(1163), + id: DeclarationId(1165), name: Some("go_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34244,7 +34296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34263,7 +34315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23258), }); declarations.push(Declaration { - id: DeclarationId(1164), + id: DeclarationId(1166), name: Some("go_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34278,7 +34330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34297,7 +34349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23260, 23400), }); declarations.push(Declaration { - id: DeclarationId(1165), + id: DeclarationId(1167), name: Some("go_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34312,7 +34364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34331,7 +34383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23402, 23541), }); declarations.push(Declaration { - id: DeclarationId(1166), + id: DeclarationId(1168), name: Some("go_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34346,7 +34398,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34365,7 +34417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23543, 23683), }); declarations.push(Declaration { - id: DeclarationId(1167), + id: DeclarationId(1169), name: Some("go_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34380,7 +34432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34399,7 +34451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23685, 23834), }); declarations.push(Declaration { - id: DeclarationId(1168), + id: DeclarationId(1170), name: Some("go_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -34414,7 +34466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34433,7 +34485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23836, 23985), }); declarations.push(Declaration { - id: DeclarationId(1169), + id: DeclarationId(1171), name: Some("go_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -34448,11 +34500,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1079)), + FieldValue::Reference(DeclarationId(1081)), ), ( "carrier".to_string(), @@ -34468,7 +34520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23987, 24120), }); declarations.push(Declaration { - id: DeclarationId(1170), + id: DeclarationId(1172), name: Some("go_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -34483,11 +34535,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1077)), + FieldValue::Reference(DeclarationId(1079)), ), ( "carrier".to_string(), @@ -34503,7 +34555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24122, 24265), }); declarations.push(Declaration { - id: DeclarationId(1171), + id: DeclarationId(1173), name: Some("go_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -34518,11 +34570,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1080)), + FieldValue::Reference(DeclarationId(1082)), ), ( "carrier".to_string(), @@ -34538,7 +34590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24267, 24420), }); declarations.push(Declaration { - id: DeclarationId(1172), + id: DeclarationId(1174), name: Some("go_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34553,7 +34605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34562,7 +34614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -34575,7 +34627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24422, 24560), }); declarations.push(Declaration { - id: DeclarationId(1173), + id: DeclarationId(1175), name: Some("go_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34590,7 +34642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34599,7 +34651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -34610,7 +34662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34624,7 +34676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24562, 24754), }); declarations.push(Declaration { - id: DeclarationId(1174), + id: DeclarationId(1176), name: Some("go_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34639,7 +34691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34648,7 +34700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -34660,7 +34712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34670,7 +34722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34685,7 +34737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24756, 24973), }); declarations.push(Declaration { - id: DeclarationId(1175), + id: DeclarationId(1177), name: Some("go_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34700,7 +34752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34709,7 +34761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1935), + constructor: DeclarationId(1937), payload: vec![], }, ), @@ -34721,7 +34773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34731,7 +34783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -34746,7 +34798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24975, 25198), }); declarations.push(Declaration { - id: DeclarationId(1176), + id: DeclarationId(1178), name: Some("go_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34761,7 +34813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34770,7 +34822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1936), + constructor: DeclarationId(1938), payload: vec![], }, ), @@ -34781,7 +34833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -34795,7 +34847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25200, 25383), }); declarations.push(Declaration { - id: DeclarationId(1177), + id: DeclarationId(1179), name: Some("go_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -34810,7 +34862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34828,7 +34880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25385, 25521), }); declarations.push(Declaration { - id: DeclarationId(1178), + id: DeclarationId(1180), name: Some("go_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -34843,7 +34895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34863,7 +34915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26207, 26360), }); declarations.push(Declaration { - id: DeclarationId(1179), + id: DeclarationId(1181), name: Some("go_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -34878,7 +34930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34896,7 +34948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26362, 26502), }); declarations.push(Declaration { - id: DeclarationId(1180), + id: DeclarationId(1182), name: Some("go_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34911,7 +34963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34920,7 +34972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1937), + constructor: DeclarationId(1939), payload: vec![], }, ), @@ -34931,7 +34983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -34945,7 +34997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26504, 26692), }); declarations.push(Declaration { - id: DeclarationId(1181), + id: DeclarationId(1183), name: Some("go_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -34960,7 +35012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -34969,7 +35021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1938), + constructor: DeclarationId(1940), payload: vec![], }, ), @@ -34981,7 +35033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -34991,7 +35043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -35001,7 +35053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35016,7 +35068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26694, 26951), }); declarations.push(Declaration { - id: DeclarationId(1182), + id: DeclarationId(1184), name: Some("go_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -35031,7 +35083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35040,7 +35092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1939), + constructor: DeclarationId(1941), payload: vec![], }, ), @@ -35052,7 +35104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35062,7 +35114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35077,7 +35129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26953, 27167), }); declarations.push(Declaration { - id: DeclarationId(1183), + id: DeclarationId(1185), name: Some("go_filter_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -35092,7 +35144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35101,7 +35153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1940), + constructor: DeclarationId(1942), payload: vec![], }, ), @@ -35113,7 +35165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35123,7 +35175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35138,7 +35190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27169, 27392), }); declarations.push(Declaration { - id: DeclarationId(1184), + id: DeclarationId(1186), name: Some("go_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -35153,7 +35205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35162,7 +35214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1941), + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -35174,7 +35226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35184,7 +35236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -35199,7 +35251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27394, 27623), }); declarations.push(Declaration { - id: DeclarationId(1185), + id: DeclarationId(1187), name: Some("go_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(910), @@ -35214,7 +35266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "target".to_string(), @@ -35223,17 +35275,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1501)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1503)), ), ( "scrutinee".to_string(), @@ -35263,7 +35315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27710, 28016), }); declarations.push(Declaration { - id: DeclarationId(1186), + id: DeclarationId(1188), name: Some("go_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -35293,7 +35345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28018, 28148), }); declarations.push(Declaration { - id: DeclarationId(1187), + id: DeclarationId(1189), name: Some("go_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(913), @@ -35327,7 +35379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28150, 28310), }); declarations.push(Declaration { - id: DeclarationId(1188), + id: DeclarationId(1190), name: Some("go_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(915), @@ -35372,7 +35424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28312, 28513), }); declarations.push(Declaration { - id: DeclarationId(1189), + id: DeclarationId(1191), name: Some("go_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -35404,7 +35456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28515, 28625), }); declarations.push(Declaration { - id: DeclarationId(1190), + id: DeclarationId(1192), name: Some("go_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -35426,7 +35478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28627, 28684), }); declarations.push(Declaration { - id: DeclarationId(1191), + id: DeclarationId(1193), name: Some("go_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(918), @@ -35472,7 +35524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28686, 28971), }); declarations.push(Declaration { - id: DeclarationId(1192), + id: DeclarationId(1194), name: Some("go_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -35494,7 +35546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28973, 29052), }); declarations.push(Declaration { - id: DeclarationId(1193), + id: DeclarationId(1195), name: Some("go_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -35538,7 +35590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29054, 29277), }); declarations.push(Declaration { - id: DeclarationId(1194), + id: DeclarationId(1196), name: Some("go_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -35592,7 +35644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29279, 29571), }); declarations.push(Declaration { - id: DeclarationId(1195), + id: DeclarationId(1197), name: Some("go_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -35666,7 +35718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29573, 30008), }); declarations.push(Declaration { - id: DeclarationId(1196), + id: DeclarationId(1198), name: Some("go_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -35710,7 +35762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30010, 30278), }); declarations.push(Declaration { - id: DeclarationId(1197), + id: DeclarationId(1199), name: Some("go_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -35738,7 +35790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31035, 31150), }); declarations.push(Declaration { - id: DeclarationId(1198), + id: DeclarationId(1200), name: Some("go_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -35753,51 +35805,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1186)), + FieldValue::Reference(DeclarationId(1188)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1187)), + FieldValue::Reference(DeclarationId(1189)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1188)), + FieldValue::Reference(DeclarationId(1190)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1189)), + FieldValue::Reference(DeclarationId(1191)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1190)), + FieldValue::Reference(DeclarationId(1192)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1191)), + FieldValue::Reference(DeclarationId(1193)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1192)), + FieldValue::Reference(DeclarationId(1194)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1193)), + FieldValue::Reference(DeclarationId(1195)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1197)), + FieldValue::Reference(DeclarationId(1199)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1194)), + FieldValue::Reference(DeclarationId(1196)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1195)), + FieldValue::Reference(DeclarationId(1197)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1196)), + FieldValue::Reference(DeclarationId(1198)), ), ], }), @@ -35806,7 +35858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31152, 31571), }); declarations.push(Declaration { - id: DeclarationId(1199), + id: DeclarationId(1201), name: Some("go_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(827), @@ -35842,7 +35894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33238, 33374), }); declarations.push(Declaration { - id: DeclarationId(1200), + id: DeclarationId(1202), name: Some("go_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(818), @@ -35858,55 +35910,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(1795), + constructor: DeclarationId(1797), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1798), + constructor: DeclarationId(1800), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1801), + constructor: DeclarationId(1803), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(1804), + constructor: DeclarationId(1806), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(1808), + constructor: DeclarationId(1810), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1810), + constructor: DeclarationId(1812), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(1814), + constructor: DeclarationId(1816), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1199)), + FieldValue::Reference(DeclarationId(1201)), ), ( "post_emit_verifier".to_string(), @@ -35932,7 +35984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1817), + constructor: DeclarationId(1819), payload: vec![], }, ), @@ -35945,7 +35997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33376, 33934), }); declarations.push(Declaration { - id: DeclarationId(1201), + id: DeclarationId(1203), name: Some("go_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(819), @@ -35960,11 +36012,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1200)), + FieldValue::Reference(DeclarationId(1202)), ), ], }), @@ -35973,7 +36025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33936, 34060), }); declarations.push(Declaration { - id: DeclarationId(1202), + id: DeclarationId(1204), name: Some("python_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -36001,7 +36053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 1887, 2009), }); declarations.push(Declaration { - id: DeclarationId(1203), + id: DeclarationId(1205), name: Some("python_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(913), @@ -36035,7 +36087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2011, 2164), }); declarations.push(Declaration { - id: DeclarationId(1204), + id: DeclarationId(1206), name: Some("python_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(915), @@ -36080,7 +36132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2166, 2381), }); declarations.push(Declaration { - id: DeclarationId(1205), + id: DeclarationId(1207), name: Some("python_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -36112,7 +36164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2383, 2497), }); declarations.push(Declaration { - id: DeclarationId(1206), + id: DeclarationId(1208), name: Some("python_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -36134,7 +36186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2499, 2560), }); declarations.push(Declaration { - id: DeclarationId(1207), + id: DeclarationId(1209), name: Some("python_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(918), @@ -36180,7 +36232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2562, 2869), }); declarations.push(Declaration { - id: DeclarationId(1208), + id: DeclarationId(1210), name: Some("python_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -36204,7 +36256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2871, 2970), }); declarations.push(Declaration { - id: DeclarationId(1209), + id: DeclarationId(1211), name: Some("python_type_definitions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -36252,7 +36304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2972, 3303), }); declarations.push(Declaration { - id: DeclarationId(1210), + id: DeclarationId(1212), name: Some("python_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -36306,7 +36358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3305, 3635), }); declarations.push(Declaration { - id: DeclarationId(1211), + id: DeclarationId(1213), name: Some("python_collections".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -36372,7 +36424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3637, 4026), }); declarations.push(Declaration { - id: DeclarationId(1212), + id: DeclarationId(1214), name: Some("python_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -36412,7 +36464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4028, 4280), }); declarations.push(Declaration { - id: DeclarationId(1213), + id: DeclarationId(1215), name: Some("python_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -36440,7 +36492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4483, 4602), }); declarations.push(Declaration { - id: DeclarationId(1214), + id: DeclarationId(1216), name: Some("python_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -36455,51 +36507,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1203)), + FieldValue::Reference(DeclarationId(1205)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1204)), + FieldValue::Reference(DeclarationId(1206)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1205)), + FieldValue::Reference(DeclarationId(1207)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1206)), + FieldValue::Reference(DeclarationId(1208)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1207)), + FieldValue::Reference(DeclarationId(1209)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1208)), + FieldValue::Reference(DeclarationId(1210)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1209)), + FieldValue::Reference(DeclarationId(1211)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1213)), + FieldValue::Reference(DeclarationId(1215)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1210)), + FieldValue::Reference(DeclarationId(1212)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1211)), + FieldValue::Reference(DeclarationId(1213)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1212)), + FieldValue::Reference(DeclarationId(1214)), ), ], }), @@ -36508,7 +36560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4604, 5079), }); declarations.push(Declaration { - id: DeclarationId(1215), + id: DeclarationId(1217), name: Some("python_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(853), @@ -36524,14 +36576,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(1859), + constructor: DeclarationId(1861), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1864), payload: vec![], }, ), @@ -36542,7 +36594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5081, 5178), }); declarations.push(Declaration { - id: DeclarationId(1216), + id: DeclarationId(1218), name: Some("python_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(855), @@ -36570,7 +36622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5180, 5316), }); declarations.push(Declaration { - id: DeclarationId(1217), + id: DeclarationId(1219), name: Some("python_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -36591,7 +36643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5397), }); declarations.push(Declaration { - id: DeclarationId(1218), + id: DeclarationId(1220), name: Some("python_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36606,7 +36658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36629,7 +36681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5399, 5535), }); declarations.push(Declaration { - id: DeclarationId(1219), + id: DeclarationId(1221), name: Some("python_integer_inhabit_at_i32_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -36644,7 +36696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "kernel_integer".to_string(), @@ -36657,15 +36709,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -36677,7 +36729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ], }), @@ -36686,7 +36738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5628, 5937), }); declarations.push(Declaration { - id: DeclarationId(1220), + id: DeclarationId(1222), name: Some("python_integer_inhabit_unbounded_decl".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -36701,7 +36753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "kernel_integer".to_string(), @@ -36714,16 +36766,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1594), + constructor: DeclarationId(1596), payload: vec![], }], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ], }), @@ -36732,7 +36784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6225), }); declarations.push(Declaration { - id: DeclarationId(1221), + id: DeclarationId(1223), name: Some("python_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36747,7 +36799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36770,7 +36822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6227, 6366), }); declarations.push(Declaration { - id: DeclarationId(1222), + id: DeclarationId(1224), name: Some("python_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36785,7 +36837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36808,7 +36860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6368, 6510), }); declarations.push(Declaration { - id: DeclarationId(1223), + id: DeclarationId(1225), name: Some("python_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36823,7 +36875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36846,7 +36898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6512, 6658), }); declarations.push(Declaration { - id: DeclarationId(1224), + id: DeclarationId(1226), name: Some("python_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36861,7 +36913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36884,7 +36936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6660, 6806), }); declarations.push(Declaration { - id: DeclarationId(1225), + id: DeclarationId(1227), name: Some("python_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36899,7 +36951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36922,7 +36974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6808, 6975), }); declarations.push(Declaration { - id: DeclarationId(1226), + id: DeclarationId(1228), name: Some("python_declaration_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36937,11 +36989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1081)), + FieldValue::Reference(DeclarationId(1083)), ), ( "carrier".to_string(), @@ -36960,7 +37012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6977, 7146), }); declarations.push(Declaration { - id: DeclarationId(1227), + id: DeclarationId(1229), name: Some("python_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -36975,7 +37027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -36998,7 +37050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7148, 7307), }); declarations.push(Declaration { - id: DeclarationId(1228), + id: DeclarationId(1230), name: Some("python_dag_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37013,7 +37065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37036,7 +37088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7309, 7459), }); declarations.push(Declaration { - id: DeclarationId(1229), + id: DeclarationId(1231), name: Some("python_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37051,7 +37103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37074,7 +37126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7461, 7620), }); declarations.push(Declaration { - id: DeclarationId(1230), + id: DeclarationId(1232), name: Some("python_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37089,7 +37141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37112,7 +37164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7622, 7778), }); declarations.push(Declaration { - id: DeclarationId(1231), + id: DeclarationId(1233), name: Some("python_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37127,7 +37179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37150,7 +37202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7780, 7948), }); declarations.push(Declaration { - id: DeclarationId(1232), + id: DeclarationId(1234), name: Some("python_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37165,7 +37217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37188,7 +37240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7950, 8109), }); declarations.push(Declaration { - id: DeclarationId(1233), + id: DeclarationId(1235), name: Some("python_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37203,7 +37255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37226,7 +37278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8111, 8264), }); declarations.push(Declaration { - id: DeclarationId(1234), + id: DeclarationId(1236), name: Some("python_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37241,7 +37293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37264,7 +37316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8266, 8419), }); declarations.push(Declaration { - id: DeclarationId(1235), + id: DeclarationId(1237), name: Some("python_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37279,7 +37331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37302,7 +37354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8421, 8573), }); declarations.push(Declaration { - id: DeclarationId(1236), + id: DeclarationId(1238), name: Some("python_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37317,7 +37369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37340,7 +37392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8575, 8712), }); declarations.push(Declaration { - id: DeclarationId(1237), + id: DeclarationId(1239), name: Some("python_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37355,7 +37407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37379,7 +37431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -37399,7 +37451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8786, 9035), }); declarations.push(Declaration { - id: DeclarationId(1238), + id: DeclarationId(1240), name: Some("python_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37414,7 +37466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37437,7 +37489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9037, 9199), }); declarations.push(Declaration { - id: DeclarationId(1239), + id: DeclarationId(1241), name: Some("python_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37452,7 +37504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37477,7 +37529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37496,7 +37548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -37517,7 +37569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -37538,7 +37590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9201, 9607), }); declarations.push(Declaration { - id: DeclarationId(1240), + id: DeclarationId(1242), name: Some("python_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37553,7 +37605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37578,7 +37630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37597,7 +37649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -37618,7 +37670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9609, 9926), }); declarations.push(Declaration { - id: DeclarationId(1241), + id: DeclarationId(1243), name: Some("python_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37633,7 +37685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37658,7 +37710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37677,7 +37729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -37696,7 +37748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37717,7 +37769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9928, 10338), }); declarations.push(Declaration { - id: DeclarationId(1242), + id: DeclarationId(1244), name: Some("python_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37732,7 +37784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37755,7 +37807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10340, 10511), }); declarations.push(Declaration { - id: DeclarationId(1243), + id: DeclarationId(1245), name: Some("python_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37770,7 +37822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37793,7 +37845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10513, 10675), }); declarations.push(Declaration { - id: DeclarationId(1244), + id: DeclarationId(1246), name: Some("python_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37808,7 +37860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37833,7 +37885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37852,7 +37904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -37871,7 +37923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37892,7 +37944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10677, 11096), }); declarations.push(Declaration { - id: DeclarationId(1245), + id: DeclarationId(1247), name: Some("python_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -37907,7 +37959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -37932,7 +37984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -37953,7 +38005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -37972,7 +38024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -37991,7 +38043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38012,7 +38064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11098, 11591), }); declarations.push(Declaration { - id: DeclarationId(1246), + id: DeclarationId(1248), name: Some("python_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38027,7 +38079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38052,7 +38104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -38071,7 +38123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -38090,7 +38142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38111,7 +38163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11593, 12007), }); declarations.push(Declaration { - id: DeclarationId(1247), + id: DeclarationId(1249), name: Some("python_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38126,7 +38178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38151,7 +38203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -38170,7 +38222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -38189,7 +38241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38210,7 +38262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12009, 12435), }); declarations.push(Declaration { - id: DeclarationId(1248), + id: DeclarationId(1250), name: Some("python_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38225,7 +38277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38248,7 +38300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12437, 12608), }); declarations.push(Declaration { - id: DeclarationId(1249), + id: DeclarationId(1251), name: Some("python_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38263,7 +38315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38286,7 +38338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12610, 12781), }); declarations.push(Declaration { - id: DeclarationId(1250), + id: DeclarationId(1252), name: Some("python_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -38301,7 +38353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38324,7 +38376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12783, 12945), }); declarations.push(Declaration { - id: DeclarationId(1251), + id: DeclarationId(1253), name: Some("python_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38339,7 +38391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38358,7 +38410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12947, 13096), }); declarations.push(Declaration { - id: DeclarationId(1252), + id: DeclarationId(1254), name: Some("python_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38373,7 +38425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38392,7 +38444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13098, 13247), }); declarations.push(Declaration { - id: DeclarationId(1253), + id: DeclarationId(1255), name: Some("python_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38407,7 +38459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38426,7 +38478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13249, 13398), }); declarations.push(Declaration { - id: DeclarationId(1254), + id: DeclarationId(1256), name: Some("python_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38441,7 +38493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38462,7 +38514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13400, 13559), }); declarations.push(Declaration { - id: DeclarationId(1255), + id: DeclarationId(1257), name: Some("python_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38477,7 +38529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38496,7 +38548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13561, 13709), }); declarations.push(Declaration { - id: DeclarationId(1256), + id: DeclarationId(1258), name: Some("python_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38511,7 +38563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38530,7 +38582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13711, 13866), }); declarations.push(Declaration { - id: DeclarationId(1257), + id: DeclarationId(1259), name: Some("python_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38545,7 +38597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38564,7 +38616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13868, 14023), }); declarations.push(Declaration { - id: DeclarationId(1258), + id: DeclarationId(1260), name: Some("python_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38579,7 +38631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38598,7 +38650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14025, 14194), }); declarations.push(Declaration { - id: DeclarationId(1259), + id: DeclarationId(1261), name: Some("python_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38613,7 +38665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38632,7 +38684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14196, 14344), }); declarations.push(Declaration { - id: DeclarationId(1260), + id: DeclarationId(1262), name: Some("python_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38647,7 +38699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38666,7 +38718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14346, 14493), }); declarations.push(Declaration { - id: DeclarationId(1261), + id: DeclarationId(1263), name: Some("python_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38681,7 +38733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38700,7 +38752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14495, 14643), }); declarations.push(Declaration { - id: DeclarationId(1262), + id: DeclarationId(1264), name: Some("python_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38715,7 +38767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38734,7 +38786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14645, 14792), }); declarations.push(Declaration { - id: DeclarationId(1263), + id: DeclarationId(1265), name: Some("python_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38749,7 +38801,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38768,7 +38820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14794, 14942), }); declarations.push(Declaration { - id: DeclarationId(1264), + id: DeclarationId(1266), name: Some("python_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38783,7 +38835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38802,7 +38854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14944, 15102), }); declarations.push(Declaration { - id: DeclarationId(1265), + id: DeclarationId(1267), name: Some("python_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -38817,7 +38869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38836,7 +38888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15104, 15261), }); declarations.push(Declaration { - id: DeclarationId(1266), + id: DeclarationId(1268), name: Some("python_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38851,7 +38903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38860,7 +38912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -38873,7 +38925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15263, 15409), }); declarations.push(Declaration { - id: DeclarationId(1267), + id: DeclarationId(1269), name: Some("python_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38888,7 +38940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38897,7 +38949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -38908,7 +38960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -38922,7 +38974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15411, 15611), }); declarations.push(Declaration { - id: DeclarationId(1268), + id: DeclarationId(1270), name: Some("python_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38937,7 +38989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -38946,7 +38998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -38958,7 +39010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -38968,7 +39020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -38983,7 +39035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15613, 15838), }); declarations.push(Declaration { - id: DeclarationId(1269), + id: DeclarationId(1271), name: Some("python_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -38998,7 +39050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39007,7 +39059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1935), + constructor: DeclarationId(1937), payload: vec![], }, ), @@ -39019,7 +39071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -39029,7 +39081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -39044,7 +39096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15840, 16071), }); declarations.push(Declaration { - id: DeclarationId(1270), + id: DeclarationId(1272), name: Some("python_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39059,7 +39111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39068,7 +39120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1936), + constructor: DeclarationId(1938), payload: vec![], }, ), @@ -39079,7 +39131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39093,7 +39145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16073, 16264), }); declarations.push(Declaration { - id: DeclarationId(1271), + id: DeclarationId(1273), name: Some("python_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39108,7 +39160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39117,7 +39169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1937), + constructor: DeclarationId(1939), payload: vec![], }, ), @@ -39128,7 +39180,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39142,7 +39194,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16266, 16462), }); declarations.push(Declaration { - id: DeclarationId(1272), + id: DeclarationId(1274), name: Some("python_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39157,7 +39209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39166,7 +39218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1938), + constructor: DeclarationId(1940), payload: vec![], }, ), @@ -39178,7 +39230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39188,7 +39240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -39198,7 +39250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39213,7 +39265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16464, 16729), }); declarations.push(Declaration { - id: DeclarationId(1273), + id: DeclarationId(1275), name: Some("python_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39228,7 +39280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39237,7 +39289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1939), + constructor: DeclarationId(1941), payload: vec![], }, ), @@ -39249,7 +39301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39259,7 +39311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39274,7 +39326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16731, 16953), }); declarations.push(Declaration { - id: DeclarationId(1274), + id: DeclarationId(1276), name: Some("python_filter_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39289,7 +39341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39298,7 +39350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1940), + constructor: DeclarationId(1942), payload: vec![], }, ), @@ -39310,7 +39362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39320,7 +39372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39335,7 +39387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16955, 17186), }); declarations.push(Declaration { - id: DeclarationId(1275), + id: DeclarationId(1277), name: Some("python_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -39350,7 +39402,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39359,7 +39411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1941), + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -39371,7 +39423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39381,7 +39433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -39396,7 +39448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17188, 17425), }); declarations.push(Declaration { - id: DeclarationId(1276), + id: DeclarationId(1278), name: Some("python_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -39411,7 +39463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39428,9 +39480,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17427, 17575), }); - declarations.push(Declaration { id: DeclarationId(1277), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(908)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1214))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) }); + declarations.push(Declaration { id: DeclarationId(1279), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(908)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1216))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) }); declarations.push(Declaration { - id: DeclarationId(1278), + id: DeclarationId(1280), name: Some("python_non_empty_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -39445,7 +39497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39465,7 +39517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18020, 18194), }); declarations.push(Declaration { - id: DeclarationId(1279), + id: DeclarationId(1281), name: Some("python_non_singleton_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -39480,7 +39532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39500,7 +39552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18196, 18382), }); declarations.push(Declaration { - id: DeclarationId(1280), + id: DeclarationId(1282), name: Some("python_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(910), @@ -39515,7 +39567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "target".to_string(), @@ -39524,17 +39576,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1501)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1503)), ), ( "scrutinee".to_string(), @@ -39564,7 +39616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18383, 18697), }); declarations.push(Declaration { - id: DeclarationId(1281), + id: DeclarationId(1283), name: Some("python_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(827), @@ -39600,7 +39652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 20762, 20904), }); declarations.push(Declaration { - id: DeclarationId(1282), + id: DeclarationId(1284), name: Some("python_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(818), @@ -39616,55 +39668,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(1795), + constructor: DeclarationId(1797), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1800), + constructor: DeclarationId(1802), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1801), + constructor: DeclarationId(1803), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(1804), + constructor: DeclarationId(1806), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(1808), + constructor: DeclarationId(1810), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1809), + constructor: DeclarationId(1811), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(1814), + constructor: DeclarationId(1816), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1281)), + FieldValue::Reference(DeclarationId(1283)), ), ( "post_emit_verifier".to_string(), @@ -39693,7 +39745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1816), + constructor: DeclarationId(1818), payload: vec![], }, ), @@ -39706,7 +39758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 20906, 21486), }); declarations.push(Declaration { - id: DeclarationId(1283), + id: DeclarationId(1285), name: Some("python_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(819), @@ -39721,11 +39773,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1282)), + FieldValue::Reference(DeclarationId(1284)), ), ], }), @@ -39734,7 +39786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 21488, 21624), }); declarations.push(Declaration { - id: DeclarationId(1284), + id: DeclarationId(1286), name: Some("rust_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(853), @@ -39750,14 +39802,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { - constructor: DeclarationId(1861), + constructor: DeclarationId(1863), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { - constructor: DeclarationId(1862), + constructor: DeclarationId(1864), payload: vec![], }, ), @@ -39768,7 +39820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4448, 4550), }); declarations.push(Declaration { - id: DeclarationId(1285), + id: DeclarationId(1287), name: Some("rust_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(855), @@ -39798,7 +39850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4552, 4704), }); declarations.push(Declaration { - id: DeclarationId(1286), + id: DeclarationId(1288), name: Some("rust_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -39819,7 +39871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4706, 4781), }); declarations.push(Declaration { - id: DeclarationId(1287), + id: DeclarationId(1289), name: Some("rust_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39834,7 +39886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39857,7 +39909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5232, 5364), }); declarations.push(Declaration { - id: DeclarationId(1288), + id: DeclarationId(1290), name: Some("rust_uint8".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39872,7 +39924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39895,7 +39947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5366, 5501), }); declarations.push(Declaration { - id: DeclarationId(1289), + id: DeclarationId(1291), name: Some("rust_i32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39910,7 +39962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39933,7 +39985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5503, 5637), }); declarations.push(Declaration { - id: DeclarationId(1290), + id: DeclarationId(1292), name: Some("rust_u32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39948,7 +40000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -39971,7 +40023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5639, 5774), }); declarations.push(Declaration { - id: DeclarationId(1291), + id: DeclarationId(1293), name: Some("rust_i128".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -39986,7 +40038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40009,7 +40061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5776, 5913), }); declarations.push(Declaration { - id: DeclarationId(1292), + id: DeclarationId(1294), name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40024,7 +40076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40037,15 +40089,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(0)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -40057,7 +40109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1290)), + FieldValue::Reference(DeclarationId(1292)), ), ], }), @@ -40066,7 +40118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6334, 6633), }); declarations.push(Declaration { - id: DeclarationId(1293), + id: DeclarationId(1295), name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40081,7 +40133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40094,15 +40146,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1918), + constructor: DeclarationId(1920), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1593), + constructor: DeclarationId(1595), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1592), + constructor: DeclarationId(1594), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1590), + constructor: DeclarationId(1592), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -40114,7 +40166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1289)), + FieldValue::Reference(DeclarationId(1291)), ), ], }), @@ -40123,7 +40175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6635, 6942), }); declarations.push(Declaration { - id: DeclarationId(1294), + id: DeclarationId(1296), name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40138,7 +40190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40151,13 +40203,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1917), + constructor: DeclarationId(1919), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1289)), + FieldValue::Reference(DeclarationId(1291)), ), ], }), @@ -40166,7 +40218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6944, 7149), }); declarations.push(Declaration { - id: DeclarationId(1295), + id: DeclarationId(1297), name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40181,7 +40233,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40194,13 +40246,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1917), + constructor: DeclarationId(1919), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1287)), + FieldValue::Reference(DeclarationId(1289)), ), ], }), @@ -40209,7 +40261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7151, 7354), }); declarations.push(Declaration { - id: DeclarationId(1296), + id: DeclarationId(1298), name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(895), @@ -40224,7 +40276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "kernel_integer".to_string(), @@ -40237,13 +40289,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1917), + constructor: DeclarationId(1919), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1291)), + FieldValue::Reference(DeclarationId(1293)), ), ], }), @@ -40252,7 +40304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7356, 7565), }); declarations.push(Declaration { - id: DeclarationId(1297), + id: DeclarationId(1299), name: Some("rust_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40267,7 +40319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40290,7 +40342,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7567, 7702), }); declarations.push(Declaration { - id: DeclarationId(1298), + id: DeclarationId(1300), name: Some("rust_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40305,7 +40357,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40328,7 +40380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7704, 7846), }); declarations.push(Declaration { - id: DeclarationId(1299), + id: DeclarationId(1301), name: Some("rust_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40343,7 +40395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40366,7 +40418,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7848, 7990), }); declarations.push(Declaration { - id: DeclarationId(1300), + id: DeclarationId(1302), name: Some("rust_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40381,7 +40433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40404,7 +40456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7992, 8134), }); declarations.push(Declaration { - id: DeclarationId(1301), + id: DeclarationId(1303), name: Some("rust_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40419,7 +40471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40442,7 +40494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8136, 8299), }); declarations.push(Declaration { - id: DeclarationId(1302), + id: DeclarationId(1304), name: Some("rust_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40457,7 +40509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40480,7 +40532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8301, 8452), }); declarations.push(Declaration { - id: DeclarationId(1303), + id: DeclarationId(1305), name: Some("rust_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40495,7 +40547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40519,7 +40571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -40539,7 +40591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8454, 8699), }); declarations.push(Declaration { - id: DeclarationId(1304), + id: DeclarationId(1306), name: Some("rust_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40554,7 +40606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40577,7 +40629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8701, 8853), }); declarations.push(Declaration { - id: DeclarationId(1305), + id: DeclarationId(1307), name: Some("rust_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40592,7 +40644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40617,7 +40669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -40636,7 +40688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -40657,7 +40709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -40678,7 +40730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8855, 9251), }); declarations.push(Declaration { - id: DeclarationId(1306), + id: DeclarationId(1308), name: Some("rust_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40693,7 +40745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40718,7 +40770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -40737,7 +40789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -40756,7 +40808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -40777,7 +40829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9253, 9651), }); declarations.push(Declaration { - id: DeclarationId(1307), + id: DeclarationId(1309), name: Some("rust_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40792,7 +40844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40815,7 +40867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9653, 9811), }); declarations.push(Declaration { - id: DeclarationId(1308), + id: DeclarationId(1310), name: Some("rust_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40830,7 +40882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40853,7 +40905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9813, 9971), }); declarations.push(Declaration { - id: DeclarationId(1309), + id: DeclarationId(1311), name: Some("rust_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40868,7 +40920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40891,7 +40943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9973, 10146), }); declarations.push(Declaration { - id: DeclarationId(1310), + id: DeclarationId(1312), name: Some("rust_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40906,7 +40958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40929,7 +40981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10148, 10296), }); declarations.push(Declaration { - id: DeclarationId(1311), + id: DeclarationId(1313), name: Some("rust_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40944,7 +40996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -40969,7 +41021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10298, 10487), }); declarations.push(Declaration { - id: DeclarationId(1312), + id: DeclarationId(1314), name: Some("rust_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -40984,7 +41036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41007,7 +41059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10489, 10653), }); declarations.push(Declaration { - id: DeclarationId(1313), + id: DeclarationId(1315), name: Some("rust_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41022,7 +41074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41047,7 +41099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -41066,7 +41118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -41087,7 +41139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10655, 10957), }); declarations.push(Declaration { - id: DeclarationId(1314), + id: DeclarationId(1316), name: Some("rust_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41102,7 +41154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41129,7 +41181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -41148,7 +41200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -41169,7 +41221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10959, 11300), }); declarations.push(Declaration { - id: DeclarationId(1315), + id: DeclarationId(1317), name: Some("rust_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41184,7 +41236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41211,7 +41263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -41230,7 +41282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -41251,7 +41303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11302, 11647), }); declarations.push(Declaration { - id: DeclarationId(1316), + id: DeclarationId(1318), name: Some("rust_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41266,7 +41318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41292,7 +41344,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -41312,7 +41364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11649, 11925), }); declarations.push(Declaration { - id: DeclarationId(1317), + id: DeclarationId(1319), name: Some("rust_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41327,7 +41379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41354,7 +41406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -41373,7 +41425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -41394,7 +41446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11927, 12244), }); declarations.push(Declaration { - id: DeclarationId(1318), + id: DeclarationId(1320), name: Some("rust_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41409,7 +41461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41434,7 +41486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -41453,7 +41505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -41474,7 +41526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12246, 12566), }); declarations.push(Declaration { - id: DeclarationId(1319), + id: DeclarationId(1321), name: Some("rust_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41489,7 +41541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41514,7 +41566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -41533,7 +41585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -41552,7 +41604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -41573,7 +41625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12568, 12981), }); declarations.push(Declaration { - id: DeclarationId(1320), + id: DeclarationId(1322), name: Some("rust_element_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41588,7 +41640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41612,7 +41664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -41632,7 +41684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12983, 13224), }); declarations.push(Declaration { - id: DeclarationId(1321), + id: DeclarationId(1323), name: Some("rust_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41647,7 +41699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41672,7 +41724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -41691,7 +41743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -41712,7 +41764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13226, 13546), }); declarations.push(Declaration { - id: DeclarationId(1322), + id: DeclarationId(1324), name: Some("rust_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41727,7 +41779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41751,7 +41803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -41771,7 +41823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13548, 13793), }); declarations.push(Declaration { - id: DeclarationId(1323), + id: DeclarationId(1325), name: Some("rust_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41786,7 +41838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41810,7 +41862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -41830,7 +41882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13795, 14040), }); declarations.push(Declaration { - id: DeclarationId(1324), + id: DeclarationId(1326), name: Some("rust_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41845,7 +41897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41869,7 +41921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -41889,7 +41941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14042, 14305), }); declarations.push(Declaration { - id: DeclarationId(1325), + id: DeclarationId(1327), name: Some("rust_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41904,7 +41956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -41929,7 +41981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -41950,7 +42002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -41971,7 +42023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14307, 14644), }); declarations.push(Declaration { - id: DeclarationId(1326), + id: DeclarationId(1328), name: Some("rust_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -41986,7 +42038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42009,7 +42061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14646, 14801), }); declarations.push(Declaration { - id: DeclarationId(1327), + id: DeclarationId(1329), name: Some("rust_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42024,7 +42076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42047,7 +42099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14803, 14955), }); declarations.push(Declaration { - id: DeclarationId(1328), + id: DeclarationId(1330), name: Some("rust_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42062,7 +42114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42085,7 +42137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14957, 15109), }); declarations.push(Declaration { - id: DeclarationId(1329), + id: DeclarationId(1331), name: Some("rust_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42100,7 +42152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42123,7 +42175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15111, 15278), }); declarations.push(Declaration { - id: DeclarationId(1330), + id: DeclarationId(1332), name: Some("rust_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42138,7 +42190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42163,7 +42215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -42182,7 +42234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -42203,7 +42255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -42224,7 +42276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -42245,7 +42297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -42266,7 +42318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -42287,7 +42339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -42308,7 +42360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -42329,7 +42381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -42348,7 +42400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -42369,7 +42421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15280, 16301), }); declarations.push(Declaration { - id: DeclarationId(1331), + id: DeclarationId(1333), name: Some("rust_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42384,7 +42436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42407,7 +42459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16303, 16464), }); declarations.push(Declaration { - id: DeclarationId(1332), + id: DeclarationId(1334), name: Some("rust_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42422,7 +42474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42445,7 +42497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16466, 16627), }); declarations.push(Declaration { - id: DeclarationId(1333), + id: DeclarationId(1335), name: Some("rust_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42460,7 +42512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42483,7 +42535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16629, 16781), }); declarations.push(Declaration { - id: DeclarationId(1334), + id: DeclarationId(1336), name: Some("rust_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42498,7 +42550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42521,7 +42573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16783, 16944), }); declarations.push(Declaration { - id: DeclarationId(1335), + id: DeclarationId(1337), name: Some("rust_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42536,7 +42588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42559,7 +42611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16946, 17116), }); declarations.push(Declaration { - id: DeclarationId(1336), + id: DeclarationId(1338), name: Some("rust_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42574,7 +42626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42597,7 +42649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17118, 17282), }); declarations.push(Declaration { - id: DeclarationId(1337), + id: DeclarationId(1339), name: Some("rust_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42612,7 +42664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42639,7 +42691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -42660,7 +42712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -42681,7 +42733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17284, 17639), }); declarations.push(Declaration { - id: DeclarationId(1338), + id: DeclarationId(1340), name: Some("rust_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42696,7 +42748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42721,7 +42773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -42742,7 +42794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -42761,7 +42813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -42780,7 +42832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -42801,7 +42853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17641, 18129), }); declarations.push(Declaration { - id: DeclarationId(1339), + id: DeclarationId(1341), name: Some("rust_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42816,7 +42868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42839,7 +42891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18131, 18283), }); declarations.push(Declaration { - id: DeclarationId(1340), + id: DeclarationId(1342), name: Some("rust_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42854,7 +42906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -42879,7 +42931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -42898,7 +42950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -42919,7 +42971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -42938,7 +42990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -42959,7 +43011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -42980,7 +43032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18285, 19058), }); declarations.push(Declaration { - id: DeclarationId(1341), + id: DeclarationId(1343), name: Some("rust_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -42995,7 +43047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43020,7 +43072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43039,7 +43091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -43058,7 +43110,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -43079,7 +43131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43098,7 +43150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43119,7 +43171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19060, 19632), }); declarations.push(Declaration { - id: DeclarationId(1342), + id: DeclarationId(1344), name: Some("rust_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43134,7 +43186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43159,7 +43211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43178,7 +43230,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -43197,7 +43249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -43218,7 +43270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43237,7 +43289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43258,7 +43310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -43279,7 +43331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19634, 20301), }); declarations.push(Declaration { - id: DeclarationId(1343), + id: DeclarationId(1345), name: Some("rust_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43294,7 +43346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43319,7 +43371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43338,7 +43390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -43357,7 +43409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -43376,7 +43428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -43395,7 +43447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -43416,7 +43468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43435,7 +43487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43456,7 +43508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20303, 21012), }); declarations.push(Declaration { - id: DeclarationId(1344), + id: DeclarationId(1346), name: Some("rust_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43471,7 +43523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43496,7 +43548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -43515,7 +43567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -43536,7 +43588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -43555,7 +43607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -43574,7 +43626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -43595,7 +43647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -43616,7 +43668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -43637,7 +43689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21014, 21774), }); declarations.push(Declaration { - id: DeclarationId(1345), + id: DeclarationId(1347), name: Some("rust_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43652,7 +43704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43675,7 +43727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21776, 21924), }); declarations.push(Declaration { - id: DeclarationId(1346), + id: DeclarationId(1348), name: Some("rust_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43690,7 +43742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43717,7 +43769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -43736,7 +43788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -43755,7 +43807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -43776,7 +43828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1920), + constructor: DeclarationId(1922), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -43797,7 +43849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21926, 22406), }); declarations.push(Declaration { - id: DeclarationId(1347), + id: DeclarationId(1349), name: Some("rust_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43812,7 +43864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43838,7 +43890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -43858,7 +43910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22619, 22879), }); declarations.push(Declaration { - id: DeclarationId(1348), + id: DeclarationId(1350), name: Some("rust_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43873,7 +43925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43898,7 +43950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22881, 23054), }); declarations.push(Declaration { - id: DeclarationId(1349), + id: DeclarationId(1351), name: Some("rust_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -43913,7 +43965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -43940,7 +43992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -43959,7 +44011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -43980,7 +44032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -44001,7 +44053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23056, 23473), }); declarations.push(Declaration { - id: DeclarationId(1350), + id: DeclarationId(1352), name: Some("rust_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44016,7 +44068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44043,7 +44095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44062,7 +44114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -44083,7 +44135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23475, 23803), }); declarations.push(Declaration { - id: DeclarationId(1351), + id: DeclarationId(1353), name: Some("rust_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44098,7 +44150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44125,7 +44177,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44144,7 +44196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -44163,7 +44215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44184,7 +44236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23805, 24226), }); declarations.push(Declaration { - id: DeclarationId(1352), + id: DeclarationId(1354), name: Some("rust_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44199,7 +44251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44224,7 +44276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24228, 24410), }); declarations.push(Declaration { - id: DeclarationId(1353), + id: DeclarationId(1355), name: Some("rust_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44239,7 +44291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44264,7 +44316,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24412, 24585), }); declarations.push(Declaration { - id: DeclarationId(1354), + id: DeclarationId(1356), name: Some("rust_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44279,7 +44331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44306,7 +44358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44325,7 +44377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -44344,7 +44396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44365,7 +44417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24587, 25017), }); declarations.push(Declaration { - id: DeclarationId(1355), + id: DeclarationId(1357), name: Some("rust_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44380,7 +44432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44407,7 +44459,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -44428,7 +44480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -44447,7 +44499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -44466,7 +44518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44487,7 +44539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25019, 25523), }); declarations.push(Declaration { - id: DeclarationId(1356), + id: DeclarationId(1358), name: Some("rust_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44502,7 +44554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44529,7 +44581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -44548,7 +44600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -44567,7 +44619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44588,7 +44640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25525, 25950), }); declarations.push(Declaration { - id: DeclarationId(1357), + id: DeclarationId(1359), name: Some("rust_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44603,7 +44655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44630,7 +44682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44649,7 +44701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -44668,7 +44720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1919), + constructor: DeclarationId(1921), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44689,7 +44741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25952, 26389), }); declarations.push(Declaration { - id: DeclarationId(1358), + id: DeclarationId(1360), name: Some("rust_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44704,7 +44756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44729,7 +44781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26391, 26573), }); declarations.push(Declaration { - id: DeclarationId(1359), + id: DeclarationId(1361), name: Some("rust_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44744,7 +44796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44769,7 +44821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26575, 26757), }); declarations.push(Declaration { - id: DeclarationId(1360), + id: DeclarationId(1362), name: Some("rust_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -44784,7 +44836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44809,7 +44861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26759, 26932), }); declarations.push(Declaration { - id: DeclarationId(1361), + id: DeclarationId(1363), name: Some("rust_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44824,7 +44876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44843,7 +44895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27787, 27932), }); declarations.push(Declaration { - id: DeclarationId(1362), + id: DeclarationId(1364), name: Some("rust_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44858,7 +44910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44877,7 +44929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27934, 28079), }); declarations.push(Declaration { - id: DeclarationId(1363), + id: DeclarationId(1365), name: Some("rust_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44892,7 +44944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44911,7 +44963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28081, 28226), }); declarations.push(Declaration { - id: DeclarationId(1364), + id: DeclarationId(1366), name: Some("rust_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44926,7 +44978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44947,7 +44999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28228, 28386), }); declarations.push(Declaration { - id: DeclarationId(1365), + id: DeclarationId(1367), name: Some("rust_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44962,7 +45014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -44981,7 +45033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28836, 28980), }); declarations.push(Declaration { - id: DeclarationId(1366), + id: DeclarationId(1368), name: Some("rust_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -44996,7 +45048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45015,7 +45067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28982, 29133), }); declarations.push(Declaration { - id: DeclarationId(1367), + id: DeclarationId(1369), name: Some("rust_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45030,7 +45082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45049,7 +45101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29135, 29286), }); declarations.push(Declaration { - id: DeclarationId(1368), + id: DeclarationId(1370), name: Some("rust_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45064,7 +45116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45083,7 +45135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29288, 29453), }); declarations.push(Declaration { - id: DeclarationId(1369), + id: DeclarationId(1371), name: Some("rust_string_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45098,7 +45150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45117,7 +45169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29646, 29796), }); declarations.push(Declaration { - id: DeclarationId(1370), + id: DeclarationId(1372), name: Some("rust_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45132,7 +45184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45151,7 +45203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29798, 29942), }); declarations.push(Declaration { - id: DeclarationId(1371), + id: DeclarationId(1373), name: Some("rust_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45166,7 +45218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45185,7 +45237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29944, 30095), }); declarations.push(Declaration { - id: DeclarationId(1372), + id: DeclarationId(1374), name: Some("rust_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45200,7 +45252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45219,7 +45271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30097, 30248), }); declarations.push(Declaration { - id: DeclarationId(1373), + id: DeclarationId(1375), name: Some("rust_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45234,7 +45286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45253,7 +45305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30250, 30415), }); declarations.push(Declaration { - id: DeclarationId(1374), + id: DeclarationId(1376), name: Some("rust_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45268,7 +45320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45287,7 +45339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30417, 30560), }); declarations.push(Declaration { - id: DeclarationId(1375), + id: DeclarationId(1377), name: Some("rust_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45302,7 +45354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45321,7 +45373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30562, 30706), }); declarations.push(Declaration { - id: DeclarationId(1376), + id: DeclarationId(1378), name: Some("rust_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45336,7 +45388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45355,7 +45407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30708, 30851), }); declarations.push(Declaration { - id: DeclarationId(1377), + id: DeclarationId(1379), name: Some("rust_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45370,7 +45422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45389,7 +45441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30853, 30997), }); declarations.push(Declaration { - id: DeclarationId(1378), + id: DeclarationId(1380), name: Some("rust_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45404,7 +45456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45423,7 +45475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30999, 31152), }); declarations.push(Declaration { - id: DeclarationId(1379), + id: DeclarationId(1381), name: Some("rust_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45438,7 +45490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45457,7 +45509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31154, 31307), }); declarations.push(Declaration { - id: DeclarationId(1380), + id: DeclarationId(1382), name: Some("rust_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -45472,11 +45524,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1079)), + FieldValue::Reference(DeclarationId(1081)), ), ( "carrier".to_string(), @@ -45492,7 +45544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32057, 32196), }); declarations.push(Declaration { - id: DeclarationId(1381), + id: DeclarationId(1383), name: Some("rust_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -45507,11 +45559,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1077)), + FieldValue::Reference(DeclarationId(1079)), ), ( "carrier".to_string(), @@ -45527,7 +45579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32198, 32345), }); declarations.push(Declaration { - id: DeclarationId(1382), + id: DeclarationId(1384), name: Some("rust_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(900), @@ -45542,11 +45594,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1080)), + FieldValue::Reference(DeclarationId(1082)), ), ( "carrier".to_string(), @@ -45563,7 +45615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517), }); declarations.push(Declaration { - id: DeclarationId(1383), + id: DeclarationId(1385), name: Some("rust_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45578,7 +45630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45587,7 +45639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -45600,7 +45652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 33894, 34036), }); declarations.push(Declaration { - id: DeclarationId(1384), + id: DeclarationId(1386), name: Some("rust_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45615,7 +45667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45624,7 +45676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -45635,7 +45687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45649,7 +45701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34038, 34234), }); declarations.push(Declaration { - id: DeclarationId(1385), + id: DeclarationId(1387), name: Some("rust_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45664,7 +45716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45673,7 +45725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -45685,7 +45737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45695,7 +45747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45710,7 +45762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34236, 34457), }); declarations.push(Declaration { - id: DeclarationId(1386), + id: DeclarationId(1388), name: Some("rust_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45725,7 +45777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45734,7 +45786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1935), + constructor: DeclarationId(1937), payload: vec![], }, ), @@ -45746,7 +45798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45756,7 +45808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -45771,7 +45823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34459, 34686), }); declarations.push(Declaration { - id: DeclarationId(1387), + id: DeclarationId(1389), name: Some("rust_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45786,7 +45838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45795,7 +45847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1936), + constructor: DeclarationId(1938), payload: vec![], }, ), @@ -45806,7 +45858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -45820,7 +45872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34688, 34875), }); declarations.push(Declaration { - id: DeclarationId(1388), + id: DeclarationId(1390), name: Some("rust_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45835,7 +45887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45853,7 +45905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34877, 35020), }); declarations.push(Declaration { - id: DeclarationId(1389), + id: DeclarationId(1391), name: Some("rust_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45868,7 +45920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45888,7 +45940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35299, 35470), }); declarations.push(Declaration { - id: DeclarationId(1390), + id: DeclarationId(1392), name: Some("rust_lookup_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45903,7 +45955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45921,7 +45973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35472, 35622), }); declarations.push(Declaration { - id: DeclarationId(1391), + id: DeclarationId(1393), name: Some("rust_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(908), @@ -45936,7 +45988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45956,7 +46008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35624, 35774), }); declarations.push(Declaration { - id: DeclarationId(1392), + id: DeclarationId(1394), name: Some("rust_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -45971,7 +46023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -45980,7 +46032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1937), + constructor: DeclarationId(1939), payload: vec![], }, ), @@ -45991,7 +46043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46005,7 +46057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35776, 35968), }); declarations.push(Declaration { - id: DeclarationId(1393), + id: DeclarationId(1395), name: Some("rust_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46020,7 +46072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46029,7 +46081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1938), + constructor: DeclarationId(1940), payload: vec![], }, ), @@ -46041,7 +46093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46051,7 +46103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1923), + constructor: DeclarationId(1925), payload: vec![], }, ), @@ -46061,7 +46113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46076,7 +46128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35970, 36231), }); declarations.push(Declaration { - id: DeclarationId(1394), + id: DeclarationId(1396), name: Some("rust_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46091,7 +46143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46100,7 +46152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1939), + constructor: DeclarationId(1941), payload: vec![], }, ), @@ -46112,7 +46164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46122,7 +46174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46137,7 +46189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 36233, 36451), }); declarations.push(Declaration { - id: DeclarationId(1395), + id: DeclarationId(1397), name: Some("rust_filter_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46152,7 +46204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46161,7 +46213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1940), + constructor: DeclarationId(1942), payload: vec![], }, ), @@ -46173,7 +46225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46183,7 +46235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46198,7 +46250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 36453, 36680), }); declarations.push(Declaration { - id: DeclarationId(1396), + id: DeclarationId(1398), name: Some("rust_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(901), @@ -46213,7 +46265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46222,7 +46274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1941), + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -46234,7 +46286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46244,7 +46296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1922), + constructor: DeclarationId(1924), payload: vec![], }, ), @@ -46259,7 +46311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 36682, 36915), }); declarations.push(Declaration { - id: DeclarationId(1397), + id: DeclarationId(1399), name: Some("rust_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(910), @@ -46274,7 +46326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -46283,17 +46335,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), ( "empty_variant".to_string(), - FieldValue::Reference(DeclarationId(1499)), + FieldValue::Reference(DeclarationId(1501)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1501)), + FieldValue::Reference(DeclarationId(1503)), ), ( "scrutinee".to_string(), @@ -46325,7 +46377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37143, 37447), }); declarations.push(Declaration { - id: DeclarationId(1398), + id: DeclarationId(1400), name: Some("rust_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -46357,7 +46409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37449, 37587), }); declarations.push(Declaration { - id: DeclarationId(1399), + id: DeclarationId(1401), name: Some("rust_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(913), @@ -46391,7 +46443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37589, 37742), }); declarations.push(Declaration { - id: DeclarationId(1400), + id: DeclarationId(1402), name: Some("rust_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(915), @@ -46436,7 +46488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37744, 37934), }); declarations.push(Declaration { - id: DeclarationId(1401), + id: DeclarationId(1403), name: Some("rust_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -46468,7 +46520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37936, 38048), }); declarations.push(Declaration { - id: DeclarationId(1402), + id: DeclarationId(1404), name: Some("rust_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -46490,7 +46542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38050, 38110), }); declarations.push(Declaration { - id: DeclarationId(1403), + id: DeclarationId(1405), name: Some("rust_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(918), @@ -46536,7 +46588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38112, 38390), }); declarations.push(Declaration { - id: DeclarationId(1404), + id: DeclarationId(1406), name: Some("rust_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -46558,7 +46610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38392, 38480), }); declarations.push(Declaration { - id: DeclarationId(1405), + id: DeclarationId(1407), name: Some("rust_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -46604,7 +46656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38482, 38784), }); declarations.push(Declaration { - id: DeclarationId(1406), + id: DeclarationId(1408), name: Some("rust_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -46636,7 +46688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38786, 38999), }); declarations.push(Declaration { - id: DeclarationId(1407), + id: DeclarationId(1409), name: Some("rust_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -46693,9 +46745,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39001, 39336), }); - declarations.push(Declaration { id: DeclarationId(1408), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); + declarations.push(Declaration { id: DeclarationId(1410), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); declarations.push(Declaration { - id: DeclarationId(1409), + id: DeclarationId(1411), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -46739,7 +46791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39931, 40203), }); declarations.push(Declaration { - id: DeclarationId(1410), + id: DeclarationId(1412), name: Some("rust_rendering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -46755,14 +46807,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "read".to_string(), FieldValue::Variant { - constructor: DeclarationId(1944), + constructor: DeclarationId(1946), payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { - constructor: DeclarationId(1946), + constructor: DeclarationId(1948), payload: vec![], }, ), @@ -46773,7 +46825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40205, 40286), }); declarations.push(Declaration { - id: DeclarationId(1411), + id: DeclarationId(1413), name: Some("rust_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -46788,51 +46840,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), - FieldValue::Reference(DeclarationId(1398)), + FieldValue::Reference(DeclarationId(1400)), ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1399)), + FieldValue::Reference(DeclarationId(1401)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1400)), + FieldValue::Reference(DeclarationId(1402)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1401)), + FieldValue::Reference(DeclarationId(1403)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1402)), + FieldValue::Reference(DeclarationId(1404)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1403)), + FieldValue::Reference(DeclarationId(1405)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1404)), + FieldValue::Reference(DeclarationId(1406)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1405)), + FieldValue::Reference(DeclarationId(1407)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1406)), + FieldValue::Reference(DeclarationId(1408)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1409)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1410)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1411)), ), ], }), @@ -46841,7 +46893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40288, 40733), }); declarations.push(Declaration { - id: DeclarationId(1412), + id: DeclarationId(1414), name: Some("rust_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(827), @@ -46877,7 +46929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42157, 42296), }); declarations.push(Declaration { - id: DeclarationId(1413), + id: DeclarationId(1415), name: Some("rust_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(818), @@ -46893,55 +46945,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { - constructor: DeclarationId(1795), + constructor: DeclarationId(1797), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1798), + constructor: DeclarationId(1800), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { - constructor: DeclarationId(1802), + constructor: DeclarationId(1804), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { - constructor: DeclarationId(1804), + constructor: DeclarationId(1806), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { - constructor: DeclarationId(1807), + constructor: DeclarationId(1809), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { - constructor: DeclarationId(1810), + constructor: DeclarationId(1812), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { - constructor: DeclarationId(1813), + constructor: DeclarationId(1815), payload: vec![], }, ), ( "correction_style".to_string(), - FieldValue::Reference(DeclarationId(1412)), + FieldValue::Reference(DeclarationId(1414)), ), ( "post_emit_verifier".to_string(), @@ -46973,7 +47025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1816), + constructor: DeclarationId(1818), payload: vec![], }, ), @@ -46986,7 +47038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42298, 42911), }); declarations.push(Declaration { - id: DeclarationId(1414), + id: DeclarationId(1416), name: Some("rust_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(819), @@ -47001,11 +47053,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1413)), + FieldValue::Reference(DeclarationId(1415)), ), ], }), @@ -47014,7 +47066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42913, 43043), }); declarations.push(Declaration { - id: DeclarationId(1415), + id: DeclarationId(1417), name: Some("rust_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47038,7 +47090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44145, 44248), }); declarations.push(Declaration { - id: DeclarationId(1416), + id: DeclarationId(1418), name: Some("rust_node_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47062,7 +47114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44250, 44353), }); declarations.push(Declaration { - id: DeclarationId(1417), + id: DeclarationId(1419), name: Some("rust_resolve_producer_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47086,7 +47138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44355, 44482), }); declarations.push(Declaration { - id: DeclarationId(1418), + id: DeclarationId(1420), name: Some("port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47105,11 +47157,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47118,7 +47170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44615), }); declarations.push(Declaration { - id: DeclarationId(1419), + id: DeclarationId(1421), name: Some("node_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47137,11 +47189,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1418)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47150,7 +47202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44617, 44748), }); declarations.push(Declaration { - id: DeclarationId(1420), + id: DeclarationId(1422), name: Some("resolve_producer_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47169,11 +47221,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1417)), + FieldValue::Reference(DeclarationId(1419)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47182,7 +47234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44750, 44917), }); declarations.push(Declaration { - id: DeclarationId(1421), + id: DeclarationId(1423), name: Some("rust_lane2_workflow_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47206,7 +47258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45428, 45557), }); declarations.push(Declaration { - id: DeclarationId(1422), + id: DeclarationId(1424), name: Some("lane2_workflow_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47225,11 +47277,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1421)), + FieldValue::Reference(DeclarationId(1423)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47238,7 +47290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45559, 45726), }); declarations.push(Declaration { - id: DeclarationId(1423), + id: DeclarationId(1425), name: Some("rust_workflow_root_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47262,7 +47314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46421, 46535), }); declarations.push(Declaration { - id: DeclarationId(1424), + id: DeclarationId(1426), name: Some("workflow_root_port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47281,11 +47333,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1423)), + FieldValue::Reference(DeclarationId(1425)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47294,7 +47346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46537, 46710), }); declarations.push(Declaration { - id: DeclarationId(1425), + id: DeclarationId(1427), name: Some("rust_workflow_root".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(894), @@ -47309,7 +47361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "target".to_string(), @@ -47332,7 +47384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47122, 47283), }); declarations.push(Declaration { - id: DeclarationId(1426), + id: DeclarationId(1428), name: Some("rust_declaration_by_id_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(745), @@ -47356,7 +47408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47610, 47733), }); declarations.push(Declaration { - id: DeclarationId(1427), + id: DeclarationId(1429), name: Some("declaration_by_id_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -47375,11 +47427,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1426)), + FieldValue::Reference(DeclarationId(1428)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ], }), @@ -47388,7 +47440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47735, 47905), }); declarations.push(Declaration { - id: DeclarationId(1428), + id: DeclarationId(1430), name: Some("CompilerHostRealization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47407,21 +47459,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502), }); declarations.push(Declaration { - id: DeclarationId(1429), + id: DeclarationId(1431), name: Some("PipelineSnapshotKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SnapshotSurface".to_string(), - ty: DeclarationId(2244), + ty: DeclarationId(2246), }, Field { label: "SnapshotDag".to_string(), - ty: DeclarationId(2245), + ty: DeclarationId(2247), }, Field { label: "SnapshotText".to_string(), - ty: DeclarationId(2246), + ty: DeclarationId(2248), }, ], }, @@ -47436,21 +47488,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576), }); declarations.push(Declaration { - id: DeclarationId(1430), + id: DeclarationId(1432), name: Some("PipelineStageBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "stage".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "realization".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "snapshot".to_string(), - ty: DeclarationId(1429), + ty: DeclarationId(1431), }, ], }, @@ -47465,7 +47517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694), }); declarations.push(Declaration { - id: DeclarationId(1431), + id: DeclarationId(1433), name: Some("parse_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47475,7 +47527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47489,7 +47541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780), }); declarations.push(Declaration { - id: DeclarationId(1432), + id: DeclarationId(1434), name: Some("lower_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47499,7 +47551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47513,7 +47565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866), }); declarations.push(Declaration { - id: DeclarationId(1433), + id: DeclarationId(1435), name: Some("infer_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47523,7 +47575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47537,7 +47589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952), }); declarations.push(Declaration { - id: DeclarationId(1434), + id: DeclarationId(1436), name: Some("compute_ownership_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47547,7 +47599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47563,7 +47615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062), }); declarations.push(Declaration { - id: DeclarationId(1435), + id: DeclarationId(1437), name: Some("emit_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47573,7 +47625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47587,7 +47639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146), }); declarations.push(Declaration { - id: DeclarationId(1436), + id: DeclarationId(1438), name: Some("lens_complexity_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -47597,7 +47649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1428)), + meta_tag: Some(DeclarationId(1430)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -47613,31 +47665,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252), }); declarations.push(Declaration { - id: DeclarationId(1437), + id: DeclarationId(1439), name: Some("parse_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1443)), + FieldValue::Reference(DeclarationId(1445)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1431)), + FieldValue::Reference(DeclarationId(1433)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2244), + constructor: DeclarationId(2246), payload: vec![], }, ), @@ -47648,31 +47700,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), }); declarations.push(Declaration { - id: DeclarationId(1438), + id: DeclarationId(1440), name: Some("lower_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1444)), + FieldValue::Reference(DeclarationId(1446)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1432)), + FieldValue::Reference(DeclarationId(1434)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47683,31 +47735,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), }); declarations.push(Declaration { - id: DeclarationId(1439), + id: DeclarationId(1441), name: Some("infer_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1445)), + FieldValue::Reference(DeclarationId(1447)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1433)), + FieldValue::Reference(DeclarationId(1435)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47718,31 +47770,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), }); declarations.push(Declaration { - id: DeclarationId(1440), + id: DeclarationId(1442), name: Some("compute_ownership_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1446)), + FieldValue::Reference(DeclarationId(1448)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1434)), + FieldValue::Reference(DeclarationId(1436)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47753,31 +47805,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), }); declarations.push(Declaration { - id: DeclarationId(1441), + id: DeclarationId(1443), name: Some("lens_complexity_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1447)), + FieldValue::Reference(DeclarationId(1449)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1436)), + FieldValue::Reference(DeclarationId(1438)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2245), + constructor: DeclarationId(2247), payload: vec![], }, ), @@ -47788,31 +47840,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), }); declarations.push(Declaration { - id: DeclarationId(1442), + id: DeclarationId(1444), name: Some("emit_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1430), + template: DeclarationId(1432), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1430)), + meta_tag: Some(DeclarationId(1432)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1448)), + FieldValue::Reference(DeclarationId(1450)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1435)), + FieldValue::Reference(DeclarationId(1437)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2246), + constructor: DeclarationId(2248), payload: vec![], }, ), @@ -47823,12 +47875,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076), }); declarations.push(Declaration { - id: DeclarationId(1443), + id: DeclarationId(1445), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197), DeclarationId(197)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1431)), + body: ArrowBody::ExternalRealization(DeclarationId(1433)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47841,12 +47893,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140), }); declarations.push(Declaration { - id: DeclarationId(1444), + id: DeclarationId(1446), name: Some("lower".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1432)), + body: ArrowBody::ExternalRealization(DeclarationId(1434)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47859,12 +47911,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), }); declarations.push(Declaration { - id: DeclarationId(1445), + id: DeclarationId(1447), name: Some("infer".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1433)), + body: ArrowBody::ExternalRealization(DeclarationId(1435)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47877,12 +47929,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), }); declarations.push(Declaration { - id: DeclarationId(1446), + id: DeclarationId(1448), name: Some("compute_ownership".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1434)), + body: ArrowBody::ExternalRealization(DeclarationId(1436)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47895,12 +47947,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288), }); declarations.push(Declaration { - id: DeclarationId(1447), + id: DeclarationId(1449), name: Some("lens_complexity".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744)], output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1436)), + body: ArrowBody::ExternalRealization(DeclarationId(1438)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47913,7 +47965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347), }); declarations.push(Declaration { - id: DeclarationId(1448), + id: DeclarationId(1450), name: Some("emit".to_string()), connective: TypeConnective::Arrow { inputs: vec![ @@ -47923,7 +47975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(928), ], output: DeclarationId(197), - body: ArrowBody::ExternalRealization(DeclarationId(1435)), + body: ArrowBody::ExternalRealization(DeclarationId(1437)), }, type_params: vec![], phantom_params: Vec::new(), @@ -47936,7 +47988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460), }); declarations.push(Declaration { - id: DeclarationId(1449), + id: DeclarationId(1451), name: Some("compile".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(928)], @@ -47958,11 +48010,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605), }); declarations.push(Declaration { - id: DeclarationId(1450), + id: DeclarationId(1452), name: Some("from_symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], - output: DeclarationId(2247), + output: DeclarationId(2249), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -47980,7 +48032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771), }); declarations.push(Declaration { - id: DeclarationId(1451), + id: DeclarationId(1453), name: Some("symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(722)], @@ -47998,7 +48050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214), }); declarations.push(Declaration { - id: DeclarationId(1452), + id: DeclarationId(1454), name: Some("algebra_field_name".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(722)], @@ -48016,7 +48068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017), }); declarations.push(Declaration { - id: DeclarationId(1453), + id: DeclarationId(1455), name: Some("LensRegistryEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -48045,15 +48097,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045), }); declarations.push(Declaration { - id: DeclarationId(1454), + id: DeclarationId(1456), name: Some("lens_cost_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48081,15 +48133,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2214), }); declarations.push(Declaration { - id: DeclarationId(1455), + id: DeclarationId(1457), name: Some("lens_cost_symbolic_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48117,15 +48169,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2216, 2404), }); declarations.push(Declaration { - id: DeclarationId(1456), + id: DeclarationId(1458), name: Some("lens_effect_enumeration_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48153,15 +48205,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2406, 2623), }); declarations.push(Declaration { - id: DeclarationId(1457), + id: DeclarationId(1459), name: Some("lens_provenance_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48189,15 +48241,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2625, 2810), }); declarations.push(Declaration { - id: DeclarationId(1458), + id: DeclarationId(1460), name: Some("lens_structural_resolution_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48228,15 +48280,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2812, 3041), }); declarations.push(Declaration { - id: DeclarationId(1459), + id: DeclarationId(1461), name: Some("lens_unused_parameters_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48264,15 +48316,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3043, 3256), }); declarations.push(Declaration { - id: DeclarationId(1460), + id: DeclarationId(1462), name: Some("lens_infer_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48300,15 +48352,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3883, 4075), }); declarations.push(Declaration { - id: DeclarationId(1461), + id: DeclarationId(1463), name: Some("lens_variant_payload_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48336,15 +48388,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4077, 4277), }); declarations.push(Declaration { - id: DeclarationId(1462), + id: DeclarationId(1464), name: Some("lens_lower_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1453), + template: DeclarationId(1455), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1453)), + meta_tag: Some(DeclarationId(1455)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -48372,17 +48424,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4527, 4719), }); declarations.push(Declaration { - id: DeclarationId(1463), + id: DeclarationId(1465), name: Some("IntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OrderedRingAlgebra".to_string(), - ty: DeclarationId(2248), + ty: DeclarationId(2250), }, Field { label: "SemiringAlgebra".to_string(), - ty: DeclarationId(2249), + ty: DeclarationId(2251), }, ], }, @@ -48397,17 +48449,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5528, 5590), }); declarations.push(Declaration { - id: DeclarationId(1464), + id: DeclarationId(1466), name: Some("NonIntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BooleanAlgebraAlgebra".to_string(), - ty: DeclarationId(2250), + ty: DeclarationId(2252), }, Field { label: "TerminalAlgebra".to_string(), - ty: DeclarationId(2251), + ty: DeclarationId(2253), }, ], }, @@ -48422,37 +48474,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5592, 5660), }); declarations.push(Declaration { - id: DeclarationId(1465), + id: DeclarationId(1467), name: Some("TargetCarrier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BitCarrier".to_string(), - ty: DeclarationId(2252), + ty: DeclarationId(2254), }, Field { label: "ByteCarrier".to_string(), - ty: DeclarationId(2253), + ty: DeclarationId(2255), }, Field { label: "Word16Carrier".to_string(), - ty: DeclarationId(2254), + ty: DeclarationId(2256), }, Field { label: "Word32Carrier".to_string(), - ty: DeclarationId(2255), + ty: DeclarationId(2257), }, Field { label: "Word64Carrier".to_string(), - ty: DeclarationId(2256), + ty: DeclarationId(2258), }, Field { label: "Word128Carrier".to_string(), - ty: DeclarationId(2257), + ty: DeclarationId(2259), }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2258), + ty: DeclarationId(2260), }, ], }, @@ -48467,21 +48519,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7234, 7376), }); declarations.push(Declaration { - id: DeclarationId(1466), + id: DeclarationId(1468), name: Some("IntegerOverflow".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TwoComplementWrap".to_string(), - ty: DeclarationId(2259), + ty: DeclarationId(2261), }, Field { label: "Saturating".to_string(), - ty: DeclarationId(2260), + ty: DeclarationId(2262), }, Field { label: "Trap".to_string(), - ty: DeclarationId(2261), + ty: DeclarationId(2263), }, ], }, @@ -48496,17 +48548,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8093, 8159), }); declarations.push(Declaration { - id: DeclarationId(1467), + id: DeclarationId(1469), name: Some("RustPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerPrimitive".to_string(), - ty: DeclarationId(2262), + ty: DeclarationId(2264), }, Field { label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2263), + ty: DeclarationId(2265), }, ], }, @@ -48521,94 +48573,94 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8914, 9696), }); declarations.push(Declaration { - id: DeclarationId(1468), + id: DeclarationId(1470), name: Some("rust_pilot_primitives".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1467), + value: DeclarationId(1469), }], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2264)), + meta_tag: Some(DeclarationId(2266)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2253), + constructor: DeclarationId(2255), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2254), + constructor: DeclarationId(2256), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2255), + constructor: DeclarationId(2257), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), FieldValue::Literal(LiteralBits::String("2147483647".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2256), + constructor: DeclarationId(2258), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -48617,21 +48669,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2248), + constructor: DeclarationId(2250), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2257), + constructor: DeclarationId(2259), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -48642,84 +48694,84 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2253), + constructor: DeclarationId(2255), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2254), + constructor: DeclarationId(2256), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2255), + constructor: DeclarationId(2257), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2262), + constructor: DeclarationId(2264), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2249), + constructor: DeclarationId(2251), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2256), + constructor: DeclarationId(2258), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -48728,36 +48780,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2263), + constructor: DeclarationId(2265), payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { - constructor: DeclarationId(2250), + constructor: DeclarationId(2252), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2252), + constructor: DeclarationId(2254), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { - constructor: DeclarationId(2263), + constructor: DeclarationId(2265), payload: vec![ FieldValue::Literal(LiteralBits::String("()".to_string())), FieldValue::Variant { - constructor: DeclarationId(2251), + constructor: DeclarationId(2253), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2258), + constructor: DeclarationId(2260), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -48769,7 +48821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9996, 13318), }); declarations.push(Declaration { - id: DeclarationId(1469), + id: DeclarationId(1471), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48789,7 +48841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272), }); declarations.push(Declaration { - id: DeclarationId(1470), + id: DeclarationId(1472), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48809,7 +48861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434), }); declarations.push(Declaration { - id: DeclarationId(1471), + id: DeclarationId(1473), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48829,7 +48881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452), }); declarations.push(Declaration { - id: DeclarationId(1472), + id: DeclarationId(1474), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48849,7 +48901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569), }); declarations.push(Declaration { - id: DeclarationId(1473), + id: DeclarationId(1475), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48869,7 +48921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169), }); declarations.push(Declaration { - id: DeclarationId(1474), + id: DeclarationId(1476), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(614), DeclarationId(613)], @@ -48887,7 +48939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1475), + id: DeclarationId(1477), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48907,7 +48959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624), }); declarations.push(Declaration { - id: DeclarationId(1476), + id: DeclarationId(1478), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(616), DeclarationId(617)], @@ -48925,7 +48977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651), }); declarations.push(Declaration { - id: DeclarationId(1477), + id: DeclarationId(1479), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48945,7 +48997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349), }); declarations.push(Declaration { - id: DeclarationId(1478), + id: DeclarationId(1480), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48965,7 +49017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367), }); declarations.push(Declaration { - id: DeclarationId(1479), + id: DeclarationId(1481), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -48985,7 +49037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), }); declarations.push(Declaration { - id: DeclarationId(1480), + id: DeclarationId(1482), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49005,7 +49057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693), }); declarations.push(Declaration { - id: DeclarationId(1481), + id: DeclarationId(1483), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(621)], @@ -49023,7 +49075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708), }); declarations.push(Declaration { - id: DeclarationId(1482), + id: DeclarationId(1484), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49043,7 +49095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720), }); declarations.push(Declaration { - id: DeclarationId(1483), + id: DeclarationId(1485), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49063,7 +49115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874), }); declarations.push(Declaration { - id: DeclarationId(1484), + id: DeclarationId(1486), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(624)], @@ -49081,7 +49133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(1485), + id: DeclarationId(1487), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49101,7 +49153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904), }); declarations.push(Declaration { - id: DeclarationId(1486), + id: DeclarationId(1488), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49121,7 +49173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137), }); declarations.push(Declaration { - id: DeclarationId(1487), + id: DeclarationId(1489), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49141,11 +49193,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158), }); declarations.push(Declaration { - id: DeclarationId(1488), + id: DeclarationId(1490), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(626)], - output: DeclarationId(1487), + output: DeclarationId(1489), body: ArrowBody::NoBody, }, type_params: vec![], @@ -49159,7 +49211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158), }); declarations.push(Declaration { - id: DeclarationId(1489), + id: DeclarationId(1491), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49179,7 +49231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170), }); declarations.push(Declaration { - id: DeclarationId(1490), + id: DeclarationId(1492), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49199,7 +49251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363), }); declarations.push(Declaration { - id: DeclarationId(1491), + id: DeclarationId(1493), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49219,7 +49271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595), }); declarations.push(Declaration { - id: DeclarationId(1492), + id: DeclarationId(1494), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49239,7 +49291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209), }); declarations.push(Declaration { - id: DeclarationId(1493), + id: DeclarationId(1495), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -49259,13 +49311,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236), }); declarations.push(Declaration { - id: DeclarationId(1494), + id: DeclarationId(1496), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1493), + value: DeclarationId(1495), }], }, type_params: vec![], @@ -49279,7 +49331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237), }); declarations.push(Declaration { - id: DeclarationId(1495), + id: DeclarationId(1497), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49299,7 +49351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422), }); declarations.push(Declaration { - id: DeclarationId(1496), + id: DeclarationId(1498), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -49319,13 +49371,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461), }); declarations.push(Declaration { - id: DeclarationId(1497), + id: DeclarationId(1499), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1496), + value: DeclarationId(1498), }], }, type_params: vec![], @@ -49339,7 +49391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462), }); declarations.push(Declaration { - id: DeclarationId(1498), + id: DeclarationId(1500), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49359,7 +49411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184), }); declarations.push(Declaration { - id: DeclarationId(1499), + id: DeclarationId(1501), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -49373,7 +49425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111), }); declarations.push(Declaration { - id: DeclarationId(1500), + id: DeclarationId(1502), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49393,7 +49445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157), }); declarations.push(Declaration { - id: DeclarationId(1501), + id: DeclarationId(1503), name: None, connective: TypeConnective::Conj { children: vec![ @@ -49403,7 +49455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "tail".to_string(), - ty: DeclarationId(1500), + ty: DeclarationId(1502), }, ], }, @@ -49418,7 +49470,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159), }); declarations.push(Declaration { - id: DeclarationId(1502), + id: DeclarationId(1504), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49438,7 +49490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490), }); declarations.push(Declaration { - id: DeclarationId(1503), + id: DeclarationId(1505), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49458,7 +49510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583), }); declarations.push(Declaration { - id: DeclarationId(1504), + id: DeclarationId(1506), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -49475,7 +49527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(1505), + id: DeclarationId(1507), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -49495,7 +49547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943), }); declarations.push(Declaration { - id: DeclarationId(1506), + id: DeclarationId(1508), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -49515,7 +49567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026), }); declarations.push(Declaration { - id: DeclarationId(1507), + id: DeclarationId(1509), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -49535,10 +49587,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058), }); declarations.push(Declaration { - id: DeclarationId(1508), + id: DeclarationId(1510), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1507), + DeclarationId(1509), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -49552,7 +49604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(1509), + id: DeclarationId(1511), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49572,7 +49624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206), }); declarations.push(Declaration { - id: DeclarationId(1510), + id: DeclarationId(1512), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -49592,10 +49644,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238), }); declarations.push(Declaration { - id: DeclarationId(1511), + id: DeclarationId(1513), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1510), + DeclarationId(1512), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -49609,7 +49661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(1512), + id: DeclarationId(1514), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49629,7 +49681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289), }); declarations.push(Declaration { - id: DeclarationId(1513), + id: DeclarationId(1515), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(167), @@ -49646,7 +49698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(1514), + id: DeclarationId(1516), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -49663,7 +49715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(1515), + id: DeclarationId(1517), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -49680,7 +49732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(1516), + id: DeclarationId(1518), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49700,7 +49752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 37237, 37258), }); declarations.push(Declaration { - id: DeclarationId(1517), + id: DeclarationId(1519), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49720,7 +49772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 37264, 37295), }); declarations.push(Declaration { - id: DeclarationId(1518), + id: DeclarationId(1520), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49739,7 +49791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561), }); declarations.push(Declaration { - id: DeclarationId(1519), + id: DeclarationId(1521), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49758,7 +49810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595), }); declarations.push(Declaration { - id: DeclarationId(1520), + id: DeclarationId(1522), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49778,7 +49830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645), }); declarations.push(Declaration { - id: DeclarationId(1521), + id: DeclarationId(1523), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -49798,12 +49850,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084), }); declarations.push(Declaration { - id: DeclarationId(1522), + id: DeclarationId(1524), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), - ty: DeclarationId(1521), + ty: DeclarationId(1523), }], }, type_params: vec![], @@ -49817,7 +49869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086), }); declarations.push(Declaration { - id: DeclarationId(1523), + id: DeclarationId(1525), name: None, connective: TypeConnective::Conj { children: vec![ @@ -49842,7 +49894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147), }); declarations.push(Declaration { - id: DeclarationId(1524), + id: DeclarationId(1526), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49861,7 +49913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555), }); declarations.push(Declaration { - id: DeclarationId(1525), + id: DeclarationId(1527), name: None, connective: TypeConnective::Conj { children: vec![ @@ -49890,7 +49942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630), }); declarations.push(Declaration { - id: DeclarationId(1526), + id: DeclarationId(1528), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -49904,7 +49956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365), }); declarations.push(Declaration { - id: DeclarationId(1527), + id: DeclarationId(1529), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49923,7 +49975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408), }); declarations.push(Declaration { - id: DeclarationId(1528), + id: DeclarationId(1530), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49942,7 +49994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451), }); declarations.push(Declaration { - id: DeclarationId(1529), + id: DeclarationId(1531), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49961,7 +50013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732), }); declarations.push(Declaration { - id: DeclarationId(1530), + id: DeclarationId(1532), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -49975,7 +50027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749), }); declarations.push(Declaration { - id: DeclarationId(1531), + id: DeclarationId(1533), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -49994,7 +50046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200), }); declarations.push(Declaration { - id: DeclarationId(1532), + id: DeclarationId(1534), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50013,7 +50065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230), }); declarations.push(Declaration { - id: DeclarationId(1533), + id: DeclarationId(1535), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50027,7 +50079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753), }); declarations.push(Declaration { - id: DeclarationId(1534), + id: DeclarationId(1536), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50046,7 +50098,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796), }); declarations.push(Declaration { - id: DeclarationId(1535), + id: DeclarationId(1537), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50065,7 +50117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528), }); declarations.push(Declaration { - id: DeclarationId(1536), + id: DeclarationId(1538), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50084,7 +50136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561), }); declarations.push(Declaration { - id: DeclarationId(1537), + id: DeclarationId(1539), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -50104,12 +50156,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601), }); declarations.push(Declaration { - id: DeclarationId(1538), + id: DeclarationId(1540), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1537), + ty: DeclarationId(1539), }], }, type_params: vec![], @@ -50123,7 +50175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603), }); declarations.push(Declaration { - id: DeclarationId(1539), + id: DeclarationId(1541), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50137,7 +50189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293), }); declarations.push(Declaration { - id: DeclarationId(1540), + id: DeclarationId(1542), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50151,7 +50203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312), }); declarations.push(Declaration { - id: DeclarationId(1541), + id: DeclarationId(1543), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50170,7 +50222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349), }); declarations.push(Declaration { - id: DeclarationId(1542), + id: DeclarationId(1544), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50189,7 +50241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560), }); declarations.push(Declaration { - id: DeclarationId(1543), + id: DeclarationId(1545), name: None, connective: TypeConnective::Conj { children: vec![ @@ -50214,7 +50266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634), }); declarations.push(Declaration { - id: DeclarationId(1544), + id: DeclarationId(1546), name: None, connective: TypeConnective::Conj { children: vec![ @@ -50251,7 +50303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789), }); declarations.push(Declaration { - id: DeclarationId(1545), + id: DeclarationId(1547), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50265,7 +50317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559), }); declarations.push(Declaration { - id: DeclarationId(1546), + id: DeclarationId(1548), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(729), @@ -50285,12 +50337,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617), }); declarations.push(Declaration { - id: DeclarationId(1547), + id: DeclarationId(1549), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "first_breaker".to_string(), - ty: DeclarationId(1546), + ty: DeclarationId(1548), }], }, type_params: vec![], @@ -50304,7 +50356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619), }); declarations.push(Declaration { - id: DeclarationId(1548), + id: DeclarationId(1550), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -50324,12 +50376,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564), }); declarations.push(Declaration { - id: DeclarationId(1549), + id: DeclarationId(1551), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ops".to_string(), - ty: DeclarationId(1548), + ty: DeclarationId(1550), }], }, type_params: vec![], @@ -50343,7 +50395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566), }); declarations.push(Declaration { - id: DeclarationId(1550), + id: DeclarationId(1552), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -50363,12 +50415,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619), }); declarations.push(Declaration { - id: DeclarationId(1551), + id: DeclarationId(1553), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "arms".to_string(), - ty: DeclarationId(1550), + ty: DeclarationId(1552), }], }, type_params: vec![], @@ -50382,7 +50434,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621), }); declarations.push(Declaration { - id: DeclarationId(1552), + id: DeclarationId(1554), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50401,7 +50453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661), }); declarations.push(Declaration { - id: DeclarationId(1553), + id: DeclarationId(1555), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -50421,12 +50473,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725), }); declarations.push(Declaration { - id: DeclarationId(1554), + id: DeclarationId(1556), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "branches".to_string(), - ty: DeclarationId(1553), + ty: DeclarationId(1555), }], }, type_params: vec![], @@ -50440,7 +50492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727), }); declarations.push(Declaration { - id: DeclarationId(1555), + id: DeclarationId(1557), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50459,7 +50511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410), }); declarations.push(Declaration { - id: DeclarationId(1556), + id: DeclarationId(1558), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50478,7 +50530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467), }); declarations.push(Declaration { - id: DeclarationId(1557), + id: DeclarationId(1559), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50492,7 +50544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984), }); declarations.push(Declaration { - id: DeclarationId(1558), + id: DeclarationId(1560), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50506,7 +50558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010), }); declarations.push(Declaration { - id: DeclarationId(1559), + id: DeclarationId(1561), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50520,7 +50572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038), }); declarations.push(Declaration { - id: DeclarationId(1560), + id: DeclarationId(1562), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50534,7 +50586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061), }); declarations.push(Declaration { - id: DeclarationId(1561), + id: DeclarationId(1563), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50548,7 +50600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084), }); declarations.push(Declaration { - id: DeclarationId(1562), + id: DeclarationId(1564), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50567,7 +50619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447), }); declarations.push(Declaration { - id: DeclarationId(1563), + id: DeclarationId(1565), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50586,7 +50638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504), }); declarations.push(Declaration { - id: DeclarationId(1564), + id: DeclarationId(1566), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50600,7 +50652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33114, 33120), }); declarations.push(Declaration { - id: DeclarationId(1565), + id: DeclarationId(1567), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50619,7 +50671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33125, 33162), }); declarations.push(Declaration { - id: DeclarationId(1566), + id: DeclarationId(1568), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50638,7 +50690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33167, 33204), }); declarations.push(Declaration { - id: DeclarationId(1567), + id: DeclarationId(1569), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50652,7 +50704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33678, 33697), }); declarations.push(Declaration { - id: DeclarationId(1568), + id: DeclarationId(1570), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50671,7 +50723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33702, 33751), }); declarations.push(Declaration { - id: DeclarationId(1569), + id: DeclarationId(1571), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(699), @@ -50688,7 +50740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18570, 18578), }); declarations.push(Declaration { - id: DeclarationId(1570), + id: DeclarationId(1572), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(743), @@ -50705,7 +50757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18627, 18636), }); declarations.push(Declaration { - id: DeclarationId(1571), + id: DeclarationId(1573), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(743), @@ -50722,7 +50774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18702, 18711), }); declarations.push(Declaration { - id: DeclarationId(1572), + id: DeclarationId(1574), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(716), @@ -50739,7 +50791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19088, 19100), }); declarations.push(Declaration { - id: DeclarationId(1573), + id: DeclarationId(1575), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), @@ -50756,7 +50808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19409, 19424), }); declarations.push(Declaration { - id: DeclarationId(1574), + id: DeclarationId(1576), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -50776,7 +50828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23408, 23429), }); declarations.push(Declaration { - id: DeclarationId(1575), + id: DeclarationId(1577), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -50796,7 +50848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23493, 23514), }); declarations.push(Declaration { - id: DeclarationId(1576), + id: DeclarationId(1578), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50810,7 +50862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489), }); declarations.push(Declaration { - id: DeclarationId(1577), + id: DeclarationId(1579), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50829,7 +50881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513), }); declarations.push(Declaration { - id: DeclarationId(1578), + id: DeclarationId(1580), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -50843,7 +50895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528), }); declarations.push(Declaration { - id: DeclarationId(1579), + id: DeclarationId(1581), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(640), @@ -50860,7 +50912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(1580), + id: DeclarationId(1582), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50879,7 +50931,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 791, 802), }); declarations.push(Declaration { - id: DeclarationId(1581), + id: DeclarationId(1583), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50898,7 +50950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 807, 820), }); declarations.push(Declaration { - id: DeclarationId(1582), + id: DeclarationId(1584), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50917,7 +50969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 825, 842), }); declarations.push(Declaration { - id: DeclarationId(1583), + id: DeclarationId(1585), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50936,7 +50988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2873, 2893), }); declarations.push(Declaration { - id: DeclarationId(1584), + id: DeclarationId(1586), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50955,7 +51007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2898, 2926), }); declarations.push(Declaration { - id: DeclarationId(1585), + id: DeclarationId(1587), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50974,7 +51026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2931, 2965), }); declarations.push(Declaration { - id: DeclarationId(1586), + id: DeclarationId(1588), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -50993,7 +51045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2970, 2999), }); declarations.push(Declaration { - id: DeclarationId(1587), + id: DeclarationId(1589), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51012,7 +51064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3004, 3021), }); declarations.push(Declaration { - id: DeclarationId(1588), + id: DeclarationId(1590), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51026,7 +51078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3625, 3632), }); declarations.push(Declaration { - id: DeclarationId(1589), + id: DeclarationId(1591), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51045,7 +51097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3637, 3687), }); declarations.push(Declaration { - id: DeclarationId(1590), + id: DeclarationId(1592), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51064,7 +51116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5251, 5275), }); declarations.push(Declaration { - id: DeclarationId(1591), + id: DeclarationId(1593), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51078,7 +51130,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5300, 5309), }); declarations.push(Declaration { - id: DeclarationId(1592), + id: DeclarationId(1594), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51097,7 +51149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5314, 5350), }); declarations.push(Declaration { - id: DeclarationId(1593), + id: DeclarationId(1595), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51122,7 +51174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5662, 5712), }); declarations.push(Declaration { - id: DeclarationId(1594), + id: DeclarationId(1596), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51136,7 +51188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5717, 5726), }); declarations.push(Declaration { - id: DeclarationId(1595), + id: DeclarationId(1597), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(704), @@ -51156,12 +51208,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6302, 6315), }); declarations.push(Declaration { - id: DeclarationId(1596), + id: DeclarationId(1598), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1595), + ty: DeclarationId(1597), }], }, type_params: vec![], @@ -51175,7 +51227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6290, 6316), }); declarations.push(Declaration { - id: DeclarationId(1597), + id: DeclarationId(1599), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51189,7 +51241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6321, 6338), }); declarations.push(Declaration { - id: DeclarationId(1598), + id: DeclarationId(1600), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51208,7 +51260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6589, 6599), }); declarations.push(Declaration { - id: DeclarationId(1599), + id: DeclarationId(1601), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51222,7 +51274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6604, 6613), }); declarations.push(Declaration { - id: DeclarationId(1600), + id: DeclarationId(1602), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51236,7 +51288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6618, 6627), }); declarations.push(Declaration { - id: DeclarationId(1601), + id: DeclarationId(1603), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51255,7 +51307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7054, 7074), }); declarations.push(Declaration { - id: DeclarationId(1602), + id: DeclarationId(1604), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51274,7 +51326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7079, 7103), }); declarations.push(Declaration { - id: DeclarationId(1603), + id: DeclarationId(1605), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51294,12 +51346,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7115, 7131), }); declarations.push(Declaration { - id: DeclarationId(1604), + id: DeclarationId(1606), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1603), + ty: DeclarationId(1605), }], }, type_params: vec![], @@ -51313,7 +51365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7108, 7132), }); declarations.push(Declaration { - id: DeclarationId(1605), + id: DeclarationId(1607), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51333,12 +51385,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7142, 7158), }); declarations.push(Declaration { - id: DeclarationId(1606), + id: DeclarationId(1608), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1605), + ty: DeclarationId(1607), }], }, type_params: vec![], @@ -51352,7 +51404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7137, 7159), }); declarations.push(Declaration { - id: DeclarationId(1607), + id: DeclarationId(1609), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51372,12 +51424,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7168, 7184), }); declarations.push(Declaration { - id: DeclarationId(1608), + id: DeclarationId(1610), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1607), + ty: DeclarationId(1609), }], }, type_params: vec![], @@ -51391,7 +51443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7164, 7185), }); declarations.push(Declaration { - id: DeclarationId(1609), + id: DeclarationId(1611), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51411,7 +51463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7248, 7264), }); declarations.push(Declaration { - id: DeclarationId(1610), + id: DeclarationId(1612), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51421,7 +51473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), - ty: DeclarationId(1609), + ty: DeclarationId(1611), }, ], }, @@ -51436,7 +51488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7190, 7270), }); declarations.push(Declaration { - id: DeclarationId(1611), + id: DeclarationId(1613), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51455,7 +51507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7429, 7458), }); declarations.push(Declaration { - id: DeclarationId(1612), + id: DeclarationId(1614), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51475,12 +51527,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7493, 7509), }); declarations.push(Declaration { - id: DeclarationId(1613), + id: DeclarationId(1615), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), - ty: DeclarationId(1612), + ty: DeclarationId(1614), }], }, type_params: vec![], @@ -51494,7 +51546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7463, 7511), }); declarations.push(Declaration { - id: DeclarationId(1614), + id: DeclarationId(1616), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51514,12 +51566,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7529, 7545), }); declarations.push(Declaration { - id: DeclarationId(1615), + id: DeclarationId(1617), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1614), + ty: DeclarationId(1616), }], }, type_params: vec![], @@ -51533,7 +51585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7516, 7546), }); declarations.push(Declaration { - id: DeclarationId(1616), + id: DeclarationId(1618), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51552,7 +51604,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7881, 7900), }); declarations.push(Declaration { - id: DeclarationId(1617), + id: DeclarationId(1619), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51571,7 +51623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7905, 7939), }); declarations.push(Declaration { - id: DeclarationId(1618), + id: DeclarationId(1620), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51585,7 +51637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7944, 7951), }); declarations.push(Declaration { - id: DeclarationId(1619), + id: DeclarationId(1621), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51599,7 +51651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7956, 7962), }); declarations.push(Declaration { - id: DeclarationId(1620), + id: DeclarationId(1622), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51618,7 +51670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7967, 7987), }); declarations.push(Declaration { - id: DeclarationId(1621), + id: DeclarationId(1623), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -51637,7 +51689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8216, 8233), }); declarations.push(Declaration { - id: DeclarationId(1622), + id: DeclarationId(1624), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51657,12 +51709,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8255, 8270), }); declarations.push(Declaration { - id: DeclarationId(1623), + id: DeclarationId(1625), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "children".to_string(), - ty: DeclarationId(1622), + ty: DeclarationId(1624), }], }, type_params: vec![], @@ -51676,7 +51728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8238, 8272), }); declarations.push(Declaration { - id: DeclarationId(1624), + id: DeclarationId(1626), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51696,12 +51748,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8294, 8309), }); declarations.push(Declaration { - id: DeclarationId(1625), + id: DeclarationId(1627), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "variants".to_string(), - ty: DeclarationId(1624), + ty: DeclarationId(1626), }], }, type_params: vec![], @@ -51715,7 +51767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8277, 8311), }); declarations.push(Declaration { - id: DeclarationId(1626), + id: DeclarationId(1628), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51735,13 +51787,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8338, 8357), }); declarations.push(Declaration { - id: DeclarationId(1627), + id: DeclarationId(1629), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), - ty: DeclarationId(1626), + ty: DeclarationId(1628), }, Field { label: "output".to_string(), @@ -51764,7 +51816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8316, 8413), }); declarations.push(Declaration { - id: DeclarationId(1628), + id: DeclarationId(1630), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51789,7 +51841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8418, 8496), }); declarations.push(Declaration { - id: DeclarationId(1629), + id: DeclarationId(1631), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51809,7 +51861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8564, 8586), }); declarations.push(Declaration { - id: DeclarationId(1630), + id: DeclarationId(1632), name: None, connective: TypeConnective::Conj { children: vec![ @@ -51819,7 +51871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arguments".to_string(), - ty: DeclarationId(1629), + ty: DeclarationId(1631), }, ], }, @@ -51834,7 +51886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8501, 8592), }); declarations.push(Declaration { - id: DeclarationId(1631), + id: DeclarationId(1633), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -51851,7 +51903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8641, 8648), }); declarations.push(Declaration { - id: DeclarationId(1632), + id: DeclarationId(1634), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51871,7 +51923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8693, 8712), }); declarations.push(Declaration { - id: DeclarationId(1633), + id: DeclarationId(1635), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51891,7 +51943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8731, 8753), }); declarations.push(Declaration { - id: DeclarationId(1634), + id: DeclarationId(1636), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(642), @@ -51908,7 +51960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8766, 8780), }); declarations.push(Declaration { - id: DeclarationId(1635), + id: DeclarationId(1637), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(642), @@ -51925,7 +51977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8793, 8807), }); declarations.push(Declaration { - id: DeclarationId(1636), + id: DeclarationId(1638), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(713), @@ -51942,7 +51994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8822, 8832), }); declarations.push(Declaration { - id: DeclarationId(1637), + id: DeclarationId(1639), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(718), @@ -51959,7 +52011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8852, 8867), }); declarations.push(Declaration { - id: DeclarationId(1638), + id: DeclarationId(1640), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -51979,7 +52031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9990, 10009), }); declarations.push(Declaration { - id: DeclarationId(1639), + id: DeclarationId(1641), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -51993,7 +52045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10290, 10293), }); declarations.push(Declaration { - id: DeclarationId(1640), + id: DeclarationId(1642), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52007,7 +52059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10298, 10301), }); declarations.push(Declaration { - id: DeclarationId(1641), + id: DeclarationId(1643), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52021,7 +52073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10306, 10309), }); declarations.push(Declaration { - id: DeclarationId(1642), + id: DeclarationId(1644), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52035,7 +52087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10314, 10317), }); declarations.push(Declaration { - id: DeclarationId(1643), + id: DeclarationId(1645), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52049,7 +52101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10441, 10443), }); declarations.push(Declaration { - id: DeclarationId(1644), + id: DeclarationId(1646), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52063,7 +52115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10448, 10450), }); declarations.push(Declaration { - id: DeclarationId(1645), + id: DeclarationId(1647), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52077,7 +52129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10455, 10457), }); declarations.push(Declaration { - id: DeclarationId(1646), + id: DeclarationId(1648), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52091,7 +52143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10462, 10464), }); declarations.push(Declaration { - id: DeclarationId(1647), + id: DeclarationId(1649), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52105,7 +52157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10469, 10471), }); declarations.push(Declaration { - id: DeclarationId(1648), + id: DeclarationId(1650), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52119,7 +52171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10476, 10478), }); declarations.push(Declaration { - id: DeclarationId(1649), + id: DeclarationId(1651), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52133,7 +52185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10731, 10734), }); declarations.push(Declaration { - id: DeclarationId(1650), + id: DeclarationId(1652), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52147,7 +52199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10739, 10741), }); declarations.push(Declaration { - id: DeclarationId(1651), + id: DeclarationId(1653), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52166,7 +52218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 10977, 11001), }); declarations.push(Declaration { - id: DeclarationId(1652), + id: DeclarationId(1654), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52185,7 +52237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11006, 11030), }); declarations.push(Declaration { - id: DeclarationId(1653), + id: DeclarationId(1655), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52204,7 +52256,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11035, 11053), }); declarations.push(Declaration { - id: DeclarationId(1654), + id: DeclarationId(1656), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52223,7 +52275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11240, 11263), }); declarations.push(Declaration { - id: DeclarationId(1655), + id: DeclarationId(1657), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(642), @@ -52240,7 +52292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11328, 11342), }); declarations.push(Declaration { - id: DeclarationId(1656), + id: DeclarationId(1658), name: None, connective: TypeConnective::Conj { children: vec![ @@ -52250,7 +52302,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "field_child".to_string(), - ty: DeclarationId(1655), + ty: DeclarationId(1657), }, ], }, @@ -52265,7 +52317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11268, 11348), }); declarations.push(Declaration { - id: DeclarationId(1657), + id: DeclarationId(1659), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52284,7 +52336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11353, 11375), }); declarations.push(Declaration { - id: DeclarationId(1658), + id: DeclarationId(1660), name: None, connective: TypeConnective::Conj { children: vec![ @@ -52309,7 +52361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11500, 11552), }); declarations.push(Declaration { - id: DeclarationId(1659), + id: DeclarationId(1661), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52328,7 +52380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11557, 11587), }); declarations.push(Declaration { - id: DeclarationId(1660), + id: DeclarationId(1662), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(725), @@ -52345,7 +52397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11751, 11766), }); declarations.push(Declaration { - id: DeclarationId(1661), + id: DeclarationId(1663), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52365,7 +52417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13742, 13773), }); declarations.push(Declaration { - id: DeclarationId(1662), + id: DeclarationId(1664), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(644), @@ -52385,7 +52437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 13797, 13827), }); declarations.push(Declaration { - id: DeclarationId(1663), + id: DeclarationId(1665), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52404,7 +52456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14450, 14479), }); declarations.push(Declaration { - id: DeclarationId(1664), + id: DeclarationId(1666), name: None, connective: TypeConnective::Conj { children: vec![ @@ -52429,7 +52481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14484, 14531), }); declarations.push(Declaration { - id: DeclarationId(1665), + id: DeclarationId(1667), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), @@ -52446,7 +52498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14800, 14815), }); declarations.push(Declaration { - id: DeclarationId(1666), + id: DeclarationId(1668), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52466,7 +52518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14889, 14901), }); declarations.push(Declaration { - id: DeclarationId(1667), + id: DeclarationId(1669), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52480,7 +52532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15142, 15151), }); declarations.push(Declaration { - id: DeclarationId(1668), + id: DeclarationId(1670), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52500,7 +52552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15209, 15225), }); declarations.push(Declaration { - id: DeclarationId(1669), + id: DeclarationId(1671), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(738), @@ -52517,7 +52569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15289, 15313), }); declarations.push(Declaration { - id: DeclarationId(1670), + id: DeclarationId(1672), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52531,7 +52583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15727, 15739), }); declarations.push(Declaration { - id: DeclarationId(1671), + id: DeclarationId(1673), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52551,7 +52603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15817, 15829), }); declarations.push(Declaration { - id: DeclarationId(1672), + id: DeclarationId(1674), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), @@ -52568,7 +52620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15867, 15882), }); declarations.push(Declaration { - id: DeclarationId(1673), + id: DeclarationId(1675), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(741), @@ -52585,7 +52637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15905, 15927), }); declarations.push(Declaration { - id: DeclarationId(1674), + id: DeclarationId(1676), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52604,7 +52656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16019, 16035), }); declarations.push(Declaration { - id: DeclarationId(1675), + id: DeclarationId(1677), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52623,7 +52675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16040, 16064), }); declarations.push(Declaration { - id: DeclarationId(1676), + id: DeclarationId(1678), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52642,7 +52694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16069, 16087), }); declarations.push(Declaration { - id: DeclarationId(1677), + id: DeclarationId(1679), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52661,7 +52713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16092, 16106), }); declarations.push(Declaration { - id: DeclarationId(1678), + id: DeclarationId(1680), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52680,7 +52732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16111, 16125), }); declarations.push(Declaration { - id: DeclarationId(1679), + id: DeclarationId(1681), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52700,7 +52752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16154, 16171), }); declarations.push(Declaration { - id: DeclarationId(1680), + id: DeclarationId(1682), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52720,7 +52772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16181, 16195), }); declarations.push(Declaration { - id: DeclarationId(1681), + id: DeclarationId(1683), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52740,7 +52792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16205, 16218), }); declarations.push(Declaration { - id: DeclarationId(1682), + id: DeclarationId(1684), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52760,7 +52812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16231, 16244), }); declarations.push(Declaration { - id: DeclarationId(1683), + id: DeclarationId(1685), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -52779,7 +52831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21450, 21468), }); declarations.push(Declaration { - id: DeclarationId(1684), + id: DeclarationId(1686), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -52793,7 +52845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21473, 21479), }); declarations.push(Declaration { - id: DeclarationId(1685), + id: DeclarationId(1687), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52813,12 +52865,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21512, 21536), }); declarations.push(Declaration { - id: DeclarationId(1686), + id: DeclarationId(1688), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "candidates".to_string(), - ty: DeclarationId(1685), + ty: DeclarationId(1687), }], }, type_params: vec![], @@ -52832,7 +52884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 21484, 21538), }); declarations.push(Declaration { - id: DeclarationId(1687), + id: DeclarationId(1689), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -52852,7 +52904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9849, 9869), }); declarations.push(Declaration { - id: DeclarationId(1688), + id: DeclarationId(1690), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -52872,7 +52924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9933, 9953), }); declarations.push(Declaration { - id: DeclarationId(1689), + id: DeclarationId(1691), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52892,7 +52944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10021, 10051), }); declarations.push(Declaration { - id: DeclarationId(1690), + id: DeclarationId(1692), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52912,7 +52964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10518, 10536), }); declarations.push(Declaration { - id: DeclarationId(1691), + id: DeclarationId(1693), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52932,7 +52984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10542, 10572), }); declarations.push(Declaration { - id: DeclarationId(1692), + id: DeclarationId(1694), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52952,7 +53004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13069, 13087), }); declarations.push(Declaration { - id: DeclarationId(1693), + id: DeclarationId(1695), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -52972,7 +53024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17290, 17320), }); declarations.push(Declaration { - id: DeclarationId(1694), + id: DeclarationId(1696), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -52992,7 +53044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17325, 17343), }); declarations.push(Declaration { - id: DeclarationId(1695), + id: DeclarationId(1697), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53012,7 +53064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17594, 17612), }); declarations.push(Declaration { - id: DeclarationId(1696), + id: DeclarationId(1698), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53032,7 +53084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17617, 17635), }); declarations.push(Declaration { - id: DeclarationId(1697), + id: DeclarationId(1699), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53052,7 +53104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18901, 18919), }); declarations.push(Declaration { - id: DeclarationId(1698), + id: DeclarationId(1700), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53072,7 +53124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19172, 19190), }); declarations.push(Declaration { - id: DeclarationId(1699), + id: DeclarationId(1701), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53092,7 +53144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19638, 19656), }); declarations.push(Declaration { - id: DeclarationId(1700), + id: DeclarationId(1702), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53112,7 +53164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21673, 21691), }); declarations.push(Declaration { - id: DeclarationId(1701), + id: DeclarationId(1703), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53132,7 +53184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21721, 21739), }); declarations.push(Declaration { - id: DeclarationId(1702), + id: DeclarationId(1704), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53152,7 +53204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22026, 22044), }); declarations.push(Declaration { - id: DeclarationId(1703), + id: DeclarationId(1705), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53172,7 +53224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22072, 22090), }); declarations.push(Declaration { - id: DeclarationId(1704), + id: DeclarationId(1706), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53192,7 +53244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22450, 22468), }); declarations.push(Declaration { - id: DeclarationId(1705), + id: DeclarationId(1707), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -53212,7 +53264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22473, 22491), }); declarations.push(Declaration { - id: DeclarationId(1706), + id: DeclarationId(1708), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53226,7 +53278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4805, 4817), }); declarations.push(Declaration { - id: DeclarationId(1707), + id: DeclarationId(1709), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53240,7 +53292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4822, 4838), }); declarations.push(Declaration { - id: DeclarationId(1708), + id: DeclarationId(1710), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53254,7 +53306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4843, 4857), }); declarations.push(Declaration { - id: DeclarationId(1709), + id: DeclarationId(1711), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53268,7 +53320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5707, 5720), }); declarations.push(Declaration { - id: DeclarationId(1710), + id: DeclarationId(1712), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53282,7 +53334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5725, 5740), }); declarations.push(Declaration { - id: DeclarationId(1711), + id: DeclarationId(1713), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53296,7 +53348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5745, 5761), }); declarations.push(Declaration { - id: DeclarationId(1712), + id: DeclarationId(1714), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53310,7 +53362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5766, 5779), }); declarations.push(Declaration { - id: DeclarationId(1713), + id: DeclarationId(1715), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(757), @@ -53327,7 +53379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6632, 6653), }); declarations.push(Declaration { - id: DeclarationId(1714), + id: DeclarationId(1716), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(758), @@ -53344,7 +53396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6668, 6678), }); declarations.push(Declaration { - id: DeclarationId(1715), + id: DeclarationId(1717), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -53361,7 +53413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6708, 6712), }); declarations.push(Declaration { - id: DeclarationId(1716), + id: DeclarationId(1718), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -53375,7 +53427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8181, 8190), }); declarations.push(Declaration { - id: DeclarationId(1717), + id: DeclarationId(1719), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53394,7 +53446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8195, 8241), }); declarations.push(Declaration { - id: DeclarationId(1718), + id: DeclarationId(1720), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53413,7 +53465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8413, 8430), }); declarations.push(Declaration { - id: DeclarationId(1719), + id: DeclarationId(1721), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53432,7 +53484,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8435, 8459), }); declarations.push(Declaration { - id: DeclarationId(1720), + id: DeclarationId(1722), name: None, connective: TypeConnective::Conj { children: vec![ @@ -53457,7 +53509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8464, 8526), }); declarations.push(Declaration { - id: DeclarationId(1721), + id: DeclarationId(1723), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -53477,12 +53529,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8543, 8573), }); declarations.push(Declaration { - id: DeclarationId(1722), + id: DeclarationId(1724), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1721), + ty: DeclarationId(1723), }], }, type_params: vec![], @@ -53496,7 +53548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8531, 8574), }); declarations.push(Declaration { - id: DeclarationId(1723), + id: DeclarationId(1725), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -53516,12 +53568,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8587, 8617), }); declarations.push(Declaration { - id: DeclarationId(1724), + id: DeclarationId(1726), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1723), + ty: DeclarationId(1725), }], }, type_params: vec![], @@ -53535,7 +53587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8579, 8618), }); declarations.push(Declaration { - id: DeclarationId(1725), + id: DeclarationId(1727), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53554,7 +53606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8623, 8644), }); declarations.push(Declaration { - id: DeclarationId(1726), + id: DeclarationId(1728), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -53573,7 +53625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8649, 8668), }); declarations.push(Declaration { - id: DeclarationId(1727), + id: DeclarationId(1729), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -53593,7 +53645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), }); declarations.push(Declaration { - id: DeclarationId(1728), + id: DeclarationId(1730), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(647)], @@ -53611,7 +53663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { - id: DeclarationId(1729), + id: DeclarationId(1731), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(623), @@ -53621,7 +53673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1484), + parameter: DeclarationId(1486), value: DeclarationId(769), }, ], @@ -53637,7 +53689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), }); declarations.push(Declaration { - id: DeclarationId(1730), + id: DeclarationId(1732), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -53657,7 +53709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), }); declarations.push(Declaration { - id: DeclarationId(1731), + id: DeclarationId(1733), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(762), DeclarationId(762)], @@ -53675,7 +53727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1732), + id: DeclarationId(1734), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53689,7 +53741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(773), }, ], @@ -53705,7 +53757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), }); declarations.push(Declaration { - id: DeclarationId(1733), + id: DeclarationId(1735), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(613)], @@ -53723,7 +53775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1734), + id: DeclarationId(1736), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53733,7 +53785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(763), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(790), }, TemplateArgument { @@ -53753,7 +53805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), }); declarations.push(Declaration { - id: DeclarationId(1735), + id: DeclarationId(1737), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(613)], @@ -53771,7 +53823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1736), + id: DeclarationId(1738), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53781,7 +53833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(763), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(790), }, TemplateArgument { @@ -53801,7 +53853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), }); declarations.push(Declaration { - id: DeclarationId(1737), + id: DeclarationId(1739), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53821,7 +53873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), }); declarations.push(Declaration { - id: DeclarationId(1738), + id: DeclarationId(1740), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53841,7 +53893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), }); declarations.push(Declaration { - id: DeclarationId(1739), + id: DeclarationId(1741), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -53861,7 +53913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), }); declarations.push(Declaration { - id: DeclarationId(1740), + id: DeclarationId(1742), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53881,7 +53933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), }); declarations.push(Declaration { - id: DeclarationId(1741), + id: DeclarationId(1743), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53901,7 +53953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), }); declarations.push(Declaration { - id: DeclarationId(1742), + id: DeclarationId(1744), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -53921,7 +53973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), }); declarations.push(Declaration { - id: DeclarationId(1743), + id: DeclarationId(1745), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -53941,7 +53993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), }); declarations.push(Declaration { - id: DeclarationId(1744), + id: DeclarationId(1746), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(762)], @@ -53959,7 +54011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1745), + id: DeclarationId(1747), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -53973,7 +54025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(790), }, ], @@ -53989,7 +54041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), }); declarations.push(Declaration { - id: DeclarationId(1746), + id: DeclarationId(1748), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -54009,7 +54061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), }); declarations.push(Declaration { - id: DeclarationId(1747), + id: DeclarationId(1749), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -54029,11 +54081,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), }); declarations.push(Declaration { - id: DeclarationId(1748), + id: DeclarationId(1750), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1705), DeclarationId(762)], - output: DeclarationId(1705), + inputs: vec![DeclarationId(1707), DeclarationId(762)], + output: DeclarationId(1707), body: ArrowBody::NoBody, }, type_params: vec![], @@ -54047,21 +54099,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1749), + id: DeclarationId(1751), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), arguments: vec![ TemplateArgument { parameter: DeclarationId(614), - value: DeclarationId(1705), + value: DeclarationId(1707), }, TemplateArgument { parameter: DeclarationId(613), value: DeclarationId(762), }, TemplateArgument { - parameter: DeclarationId(1474), + parameter: DeclarationId(1476), value: DeclarationId(793), }, ], @@ -54077,7 +54129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), }); declarations.push(Declaration { - id: DeclarationId(1750), + id: DeclarationId(1752), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54097,7 +54149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529), }); declarations.push(Declaration { - id: DeclarationId(1751), + id: DeclarationId(1753), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(86), @@ -54114,7 +54166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(1752), + id: DeclarationId(1754), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -54131,13 +54183,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(1753), + id: DeclarationId(1755), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1027), + value: DeclarationId(1029), }], }, type_params: vec![], @@ -54151,7 +54203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), }); declarations.push(Declaration { - id: DeclarationId(1754), + id: DeclarationId(1756), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54171,12 +54223,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580), }); declarations.push(Declaration { - id: DeclarationId(1755), + id: DeclarationId(1757), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), - ty: DeclarationId(1754), + ty: DeclarationId(1756), }], }, type_params: vec![], @@ -54190,7 +54242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), }); declarations.push(Declaration { - id: DeclarationId(1756), + id: DeclarationId(1758), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54210,12 +54262,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651), }); declarations.push(Declaration { - id: DeclarationId(1757), + id: DeclarationId(1759), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), - ty: DeclarationId(1756), + ty: DeclarationId(1758), }], }, type_params: vec![], @@ -54229,7 +54281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653), }); declarations.push(Declaration { - id: DeclarationId(1758), + id: DeclarationId(1760), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -54248,7 +54300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3068, 3104), }); declarations.push(Declaration { - id: DeclarationId(1759), + id: DeclarationId(1761), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(99), @@ -54265,7 +54317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3179, 3184), }); declarations.push(Declaration { - id: DeclarationId(1760), + id: DeclarationId(1762), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54279,7 +54331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "is_error".to_string(), - ty: DeclarationId(1759), + ty: DeclarationId(1761), }, ], }, @@ -54294,7 +54346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3109, 3186), }); declarations.push(Declaration { - id: DeclarationId(1761), + id: DeclarationId(1763), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -54313,7 +54365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3633, 3671), }); declarations.push(Declaration { - id: DeclarationId(1762), + id: DeclarationId(1764), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54342,7 +54394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3676, 3739), }); declarations.push(Declaration { - id: DeclarationId(1763), + id: DeclarationId(1765), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54356,7 +54408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4097, 4104), }); declarations.push(Declaration { - id: DeclarationId(1764), + id: DeclarationId(1766), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54370,7 +54422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4109, 4118), }); declarations.push(Declaration { - id: DeclarationId(1765), + id: DeclarationId(1767), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54384,7 +54436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4123, 4135), }); declarations.push(Declaration { - id: DeclarationId(1766), + id: DeclarationId(1768), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54398,7 +54450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4140, 4147), }); declarations.push(Declaration { - id: DeclarationId(1767), + id: DeclarationId(1769), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54412,7 +54464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4152, 4161), }); declarations.push(Declaration { - id: DeclarationId(1768), + id: DeclarationId(1770), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54426,7 +54478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4166, 4173), }); declarations.push(Declaration { - id: DeclarationId(1769), + id: DeclarationId(1771), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54440,7 +54492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4178, 4204), }); declarations.push(Declaration { - id: DeclarationId(1770), + id: DeclarationId(1772), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54460,7 +54512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5538, 5573), }); declarations.push(Declaration { - id: DeclarationId(1771), + id: DeclarationId(1773), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -54477,7 +54529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5652, 5659), }); declarations.push(Declaration { - id: DeclarationId(1772), + id: DeclarationId(1774), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54491,7 +54543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1207, 1220), }); declarations.push(Declaration { - id: DeclarationId(1773), + id: DeclarationId(1775), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54505,7 +54557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1225, 1231), }); declarations.push(Declaration { - id: DeclarationId(1774), + id: DeclarationId(1776), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54519,7 +54571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1236, 1254), }); declarations.push(Declaration { - id: DeclarationId(1775), + id: DeclarationId(1777), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54533,7 +54585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1259, 1277), }); declarations.push(Declaration { - id: DeclarationId(1776), + id: DeclarationId(1778), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54547,7 +54599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1282, 1296), }); declarations.push(Declaration { - id: DeclarationId(1777), + id: DeclarationId(1779), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54561,7 +54613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1578, 1587), }); declarations.push(Declaration { - id: DeclarationId(1778), + id: DeclarationId(1780), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54586,7 +54638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1592, 1669), }); declarations.push(Declaration { - id: DeclarationId(1779), + id: DeclarationId(1781), name: None, connective: TypeConnective::Conj { children: vec![ @@ -54611,7 +54663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1674, 1744), }); declarations.push(Declaration { - id: DeclarationId(1780), + id: DeclarationId(1782), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54625,7 +54677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1984, 1989), }); declarations.push(Declaration { - id: DeclarationId(1781), + id: DeclarationId(1783), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54639,7 +54691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1992, 2000), }); declarations.push(Declaration { - id: DeclarationId(1782), + id: DeclarationId(1784), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54653,7 +54705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2003, 2023), }); declarations.push(Declaration { - id: DeclarationId(1783), + id: DeclarationId(1785), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54667,7 +54719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2283), }); declarations.push(Declaration { - id: DeclarationId(1784), + id: DeclarationId(1786), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54681,7 +54733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2286, 2300), }); declarations.push(Declaration { - id: DeclarationId(1785), + id: DeclarationId(1787), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54695,7 +54747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2555, 2567), }); declarations.push(Declaration { - id: DeclarationId(1786), + id: DeclarationId(1788), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54709,7 +54761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2570, 2580), }); declarations.push(Declaration { - id: DeclarationId(1787), + id: DeclarationId(1789), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54723,7 +54775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2898, 2910), }); declarations.push(Declaration { - id: DeclarationId(1788), + id: DeclarationId(1790), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54737,7 +54789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2913, 2929), }); declarations.push(Declaration { - id: DeclarationId(1789), + id: DeclarationId(1791), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54751,7 +54803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2932, 2943), }); declarations.push(Declaration { - id: DeclarationId(1790), + id: DeclarationId(1792), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(39), @@ -54771,7 +54823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 3588, 3596), }); declarations.push(Declaration { - id: DeclarationId(1791), + id: DeclarationId(1793), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54785,7 +54837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4314, 4321), }); declarations.push(Declaration { - id: DeclarationId(1792), + id: DeclarationId(1794), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54799,7 +54851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4326, 4330), }); declarations.push(Declaration { - id: DeclarationId(1793), + id: DeclarationId(1795), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -54819,7 +54871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6578, 6599), }); declarations.push(Declaration { - id: DeclarationId(1794), + id: DeclarationId(1796), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54833,7 +54885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238), }); declarations.push(Declaration { - id: DeclarationId(1795), + id: DeclarationId(1797), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54847,7 +54899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268), }); declarations.push(Declaration { - id: DeclarationId(1796), + id: DeclarationId(1798), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54861,7 +54913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283), }); declarations.push(Declaration { - id: DeclarationId(1797), + id: DeclarationId(1799), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54875,7 +54927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565), }); declarations.push(Declaration { - id: DeclarationId(1798), + id: DeclarationId(1800), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54889,7 +54941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594), }); declarations.push(Declaration { - id: DeclarationId(1799), + id: DeclarationId(1801), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54903,7 +54955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631), }); declarations.push(Declaration { - id: DeclarationId(1800), + id: DeclarationId(1802), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54917,7 +54969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663), }); declarations.push(Declaration { - id: DeclarationId(1801), + id: DeclarationId(1803), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54931,7 +54983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393), }); declarations.push(Declaration { - id: DeclarationId(1802), + id: DeclarationId(1804), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54945,7 +54997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430), }); declarations.push(Declaration { - id: DeclarationId(1803), + id: DeclarationId(1805), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54959,7 +55011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588), }); declarations.push(Declaration { - id: DeclarationId(1804), + id: DeclarationId(1806), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54973,7 +55025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614), }); declarations.push(Declaration { - id: DeclarationId(1805), + id: DeclarationId(1807), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -54987,7 +55039,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637), }); declarations.push(Declaration { - id: DeclarationId(1806), + id: DeclarationId(1808), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55001,7 +55053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796), }); declarations.push(Declaration { - id: DeclarationId(1807), + id: DeclarationId(1809), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55015,7 +55067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831), }); declarations.push(Declaration { - id: DeclarationId(1808), + id: DeclarationId(1810), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55029,7 +55081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857), }); declarations.push(Declaration { - id: DeclarationId(1809), + id: DeclarationId(1811), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55043,7 +55095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044), }); declarations.push(Declaration { - id: DeclarationId(1810), + id: DeclarationId(1812), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55057,7 +55109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076), }); declarations.push(Declaration { - id: DeclarationId(1811), + id: DeclarationId(1813), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55071,7 +55123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095), }); declarations.push(Declaration { - id: DeclarationId(1812), + id: DeclarationId(1814), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55085,7 +55137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362), }); declarations.push(Declaration { - id: DeclarationId(1813), + id: DeclarationId(1815), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55099,7 +55151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393), }); declarations.push(Declaration { - id: DeclarationId(1814), + id: DeclarationId(1816), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55113,7 +55165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423), }); declarations.push(Declaration { - id: DeclarationId(1815), + id: DeclarationId(1817), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55133,7 +55185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332), }); declarations.push(Declaration { - id: DeclarationId(1816), + id: DeclarationId(1818), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55147,7 +55199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713), }); declarations.push(Declaration { - id: DeclarationId(1817), + id: DeclarationId(1819), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55161,7 +55213,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736), }); declarations.push(Declaration { - id: DeclarationId(1818), + id: DeclarationId(1820), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55175,7 +55227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759), }); declarations.push(Declaration { - id: DeclarationId(1819), + id: DeclarationId(1821), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55189,7 +55241,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791), }); declarations.push(Declaration { - id: DeclarationId(1820), + id: DeclarationId(1822), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -55206,7 +55258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5361, 5368), }); declarations.push(Declaration { - id: DeclarationId(1821), + id: DeclarationId(1823), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -55223,7 +55275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6292, 6296), }); declarations.push(Declaration { - id: DeclarationId(1822), + id: DeclarationId(1824), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(842), @@ -55240,7 +55292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7350, 7369), }); declarations.push(Declaration { - id: DeclarationId(1823), + id: DeclarationId(1825), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(842), @@ -55257,7 +55309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7915, 7934), }); declarations.push(Declaration { - id: DeclarationId(1824), + id: DeclarationId(1826), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55276,7 +55328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1356, 1388), }); declarations.push(Declaration { - id: DeclarationId(1825), + id: DeclarationId(1827), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55295,7 +55347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1393, 1429), }); declarations.push(Declaration { - id: DeclarationId(1826), + id: DeclarationId(1828), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55314,7 +55366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1434, 1471), }); declarations.push(Declaration { - id: DeclarationId(1827), + id: DeclarationId(1829), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55333,7 +55385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1476, 1502), }); declarations.push(Declaration { - id: DeclarationId(1828), + id: DeclarationId(1830), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55352,7 +55404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1507, 1540), }); declarations.push(Declaration { - id: DeclarationId(1829), + id: DeclarationId(1831), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55366,12 +55418,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1545, 1562), }); declarations.push(Declaration { - id: DeclarationId(1830), + id: DeclarationId(1832), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -55385,7 +55437,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1567, 1621), }); declarations.push(Declaration { - id: DeclarationId(1831), + id: DeclarationId(1833), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55399,7 +55451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1626, 1633), }); declarations.push(Declaration { - id: DeclarationId(1832), + id: DeclarationId(1834), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55418,13 +55470,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2165, 2203), }); declarations.push(Declaration { - id: DeclarationId(1833), + id: DeclarationId(1835), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "amount".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, Field { label: "collection".to_string(), @@ -55443,13 +55495,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2208, 2282), }); declarations.push(Declaration { - id: DeclarationId(1834), + id: DeclarationId(1836), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, Field { label: "ring_param".to_string(), @@ -55468,13 +55520,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2287, 2362), }); declarations.push(Declaration { - id: DeclarationId(1835), + id: DeclarationId(1837), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "divisor".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }, Field { label: "ring_param".to_string(), @@ -55493,7 +55545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2367, 2440), }); declarations.push(Declaration { - id: DeclarationId(1836), + id: DeclarationId(1838), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55512,7 +55564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2445, 2482), }); declarations.push(Declaration { - id: DeclarationId(1837), + id: DeclarationId(1839), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55531,7 +55583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2487, 2524), }); declarations.push(Declaration { - id: DeclarationId(1838), + id: DeclarationId(1840), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -55550,7 +55602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2529, 2570), }); declarations.push(Declaration { - id: DeclarationId(1839), + id: DeclarationId(1841), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55564,7 +55616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2575, 2591), }); declarations.push(Declaration { - id: DeclarationId(1840), + id: DeclarationId(1842), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55578,12 +55630,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2803, 2813), }); declarations.push(Declaration { - id: DeclarationId(1841), + id: DeclarationId(1843), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -55597,12 +55649,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2818, 2865), }); declarations.push(Declaration { - id: DeclarationId(1842), + id: DeclarationId(1844), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }], }, type_params: vec![], @@ -55616,7 +55668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2870, 2921), }); declarations.push(Declaration { - id: DeclarationId(1843), + id: DeclarationId(1845), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55630,7 +55682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3111, 3115), }); declarations.push(Declaration { - id: DeclarationId(1844), + id: DeclarationId(1846), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55644,7 +55696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3120, 3127), }); declarations.push(Declaration { - id: DeclarationId(1845), + id: DeclarationId(1847), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55658,7 +55710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3132, 3138), }); declarations.push(Declaration { - id: DeclarationId(1846), + id: DeclarationId(1848), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(834), @@ -55675,7 +55727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3441, 3454), }); declarations.push(Declaration { - id: DeclarationId(1847), + id: DeclarationId(1849), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55689,7 +55741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7082, 7093), }); declarations.push(Declaration { - id: DeclarationId(1848), + id: DeclarationId(1850), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55703,7 +55755,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7142, 7156), }); declarations.push(Declaration { - id: DeclarationId(1849), + id: DeclarationId(1851), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55717,7 +55769,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7221, 7237), }); declarations.push(Declaration { - id: DeclarationId(1850), + id: DeclarationId(1852), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55731,7 +55783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369), }); declarations.push(Declaration { - id: DeclarationId(1851), + id: DeclarationId(1853), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55745,7 +55797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381), }); declarations.push(Declaration { - id: DeclarationId(1852), + id: DeclarationId(1854), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55759,7 +55811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618), }); declarations.push(Declaration { - id: DeclarationId(1853), + id: DeclarationId(1855), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55773,7 +55825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632), }); declarations.push(Declaration { - id: DeclarationId(1854), + id: DeclarationId(1856), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55787,7 +55839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921), }); declarations.push(Declaration { - id: DeclarationId(1855), + id: DeclarationId(1857), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55801,7 +55853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935), }); declarations.push(Declaration { - id: DeclarationId(1856), + id: DeclarationId(1858), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55815,7 +55867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173), }); declarations.push(Declaration { - id: DeclarationId(1857), + id: DeclarationId(1859), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55829,7 +55881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187), }); declarations.push(Declaration { - id: DeclarationId(1858), + id: DeclarationId(1860), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55843,7 +55895,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044), }); declarations.push(Declaration { - id: DeclarationId(1859), + id: DeclarationId(1861), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55857,7 +55909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065), }); declarations.push(Declaration { - id: DeclarationId(1860), + id: DeclarationId(1862), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55871,7 +55923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080), }); declarations.push(Declaration { - id: DeclarationId(1861), + id: DeclarationId(1863), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55885,7 +55937,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099), }); declarations.push(Declaration { - id: DeclarationId(1862), + id: DeclarationId(1864), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55899,7 +55951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399), }); declarations.push(Declaration { - id: DeclarationId(1863), + id: DeclarationId(1865), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55913,7 +55965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418), }); declarations.push(Declaration { - id: DeclarationId(1864), + id: DeclarationId(1866), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55933,7 +55985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830), }); declarations.push(Declaration { - id: DeclarationId(1865), + id: DeclarationId(1867), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55953,7 +56005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3210, 3222), }); declarations.push(Declaration { - id: DeclarationId(1866), + id: DeclarationId(1868), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55967,7 +56019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3694, 3708), }); declarations.push(Declaration { - id: DeclarationId(1867), + id: DeclarationId(1869), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55981,7 +56033,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 3713, 3729), }); declarations.push(Declaration { - id: DeclarationId(1868), + id: DeclarationId(1870), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -55995,7 +56047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1022, 1036), }); declarations.push(Declaration { - id: DeclarationId(1869), + id: DeclarationId(1871), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56009,7 +56061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1041, 1051), }); declarations.push(Declaration { - id: DeclarationId(1870), + id: DeclarationId(1872), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56023,7 +56075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1056, 1068), }); declarations.push(Declaration { - id: DeclarationId(1871), + id: DeclarationId(1873), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56037,7 +56089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1073, 1085), }); declarations.push(Declaration { - id: DeclarationId(1872), + id: DeclarationId(1874), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56051,7 +56103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1090, 1103), }); declarations.push(Declaration { - id: DeclarationId(1873), + id: DeclarationId(1875), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56065,7 +56117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1108, 1120), }); declarations.push(Declaration { - id: DeclarationId(1874), + id: DeclarationId(1876), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56079,7 +56131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148), }); declarations.push(Declaration { - id: DeclarationId(1875), + id: DeclarationId(1877), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56098,7 +56150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384), }); declarations.push(Declaration { - id: DeclarationId(1876), + id: DeclarationId(1878), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56117,7 +56169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430), }); declarations.push(Declaration { - id: DeclarationId(1877), + id: DeclarationId(1879), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56137,7 +56189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905), }); declarations.push(Declaration { - id: DeclarationId(1878), + id: DeclarationId(1880), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56156,7 +56208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058), }); declarations.push(Declaration { - id: DeclarationId(1879), + id: DeclarationId(1881), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56170,7 +56222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367), }); declarations.push(Declaration { - id: DeclarationId(1880), + id: DeclarationId(1882), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56190,7 +56242,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649), }); declarations.push(Declaration { - id: DeclarationId(1881), + id: DeclarationId(1883), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56200,7 +56252,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "sites".to_string(), - ty: DeclarationId(1880), + ty: DeclarationId(1882), }, ], }, @@ -56215,7 +56267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651), }); declarations.push(Declaration { - id: DeclarationId(1882), + id: DeclarationId(1884), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56234,7 +56286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995), }); declarations.push(Declaration { - id: DeclarationId(1883), + id: DeclarationId(1885), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56253,7 +56305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449), }); declarations.push(Declaration { - id: DeclarationId(1884), + id: DeclarationId(1886), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56267,7 +56319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810), }); declarations.push(Declaration { - id: DeclarationId(1885), + id: DeclarationId(1887), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56296,7 +56348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258), }); declarations.push(Declaration { - id: DeclarationId(1886), + id: DeclarationId(1888), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56316,7 +56368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4196, 4216), }); declarations.push(Declaration { - id: DeclarationId(1887), + id: DeclarationId(1889), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56342,7 +56394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4226, 4250), }); declarations.push(Declaration { - id: DeclarationId(1888), + id: DeclarationId(1890), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56368,7 +56420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4261, 4285), }); declarations.push(Declaration { - id: DeclarationId(1889), + id: DeclarationId(1891), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56394,7 +56446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4291, 4315), }); declarations.push(Declaration { - id: DeclarationId(1890), + id: DeclarationId(1892), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56414,7 +56466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4392, 4412), }); declarations.push(Declaration { - id: DeclarationId(1891), + id: DeclarationId(1893), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56440,7 +56492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4422, 4446), }); declarations.push(Declaration { - id: DeclarationId(1892), + id: DeclarationId(1894), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56466,7 +56518,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4457, 4481), }); declarations.push(Declaration { - id: DeclarationId(1893), + id: DeclarationId(1895), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56492,7 +56544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4487, 4511), }); declarations.push(Declaration { - id: DeclarationId(1894), + id: DeclarationId(1896), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56512,7 +56564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4595, 4615), }); declarations.push(Declaration { - id: DeclarationId(1895), + id: DeclarationId(1897), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56538,7 +56590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4626, 4650), }); declarations.push(Declaration { - id: DeclarationId(1896), + id: DeclarationId(1898), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56564,7 +56616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4675, 4699), }); declarations.push(Declaration { - id: DeclarationId(1897), + id: DeclarationId(1899), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -56584,7 +56636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4790, 4810), }); declarations.push(Declaration { - id: DeclarationId(1898), + id: DeclarationId(1900), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56610,7 +56662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4821, 4845), }); declarations.push(Declaration { - id: DeclarationId(1899), + id: DeclarationId(1901), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(872), @@ -56636,7 +56688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4870, 4894), }); declarations.push(Declaration { - id: DeclarationId(1900), + id: DeclarationId(1902), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56655,7 +56707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1626, 1643), }); declarations.push(Declaration { - id: DeclarationId(1901), + id: DeclarationId(1903), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56680,7 +56732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1648, 1689), }); declarations.push(Declaration { - id: DeclarationId(1902), + id: DeclarationId(1904), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56694,7 +56746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1871, 1883), }); declarations.push(Declaration { - id: DeclarationId(1903), + id: DeclarationId(1905), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56713,7 +56765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1888, 1924), }); declarations.push(Declaration { - id: DeclarationId(1904), + id: DeclarationId(1906), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -56733,13 +56785,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2406, 2422), }); declarations.push(Declaration { - id: DeclarationId(1905), + id: DeclarationId(1907), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1904), + value: DeclarationId(1906), }], }, type_params: vec![], @@ -56753,7 +56805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2401, 2423), }); declarations.push(Declaration { - id: DeclarationId(1906), + id: DeclarationId(1908), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56767,7 +56819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witnesses".to_string(), - ty: DeclarationId(1905), + ty: DeclarationId(1907), }, ], }, @@ -56782,7 +56834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2317, 2429), }); declarations.push(Declaration { - id: DeclarationId(1907), + id: DeclarationId(1909), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56802,7 +56854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2497, 2513), }); declarations.push(Declaration { - id: DeclarationId(1908), + id: DeclarationId(1910), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -56822,13 +56874,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2536, 2552), }); declarations.push(Declaration { - id: DeclarationId(1909), + id: DeclarationId(1911), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1908), + value: DeclarationId(1910), }], }, type_params: vec![], @@ -56842,7 +56894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2531, 2553), }); declarations.push(Declaration { - id: DeclarationId(1910), + id: DeclarationId(1912), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56852,11 +56904,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "violations".to_string(), - ty: DeclarationId(1907), + ty: DeclarationId(1909), }, Field { label: "witnesses".to_string(), - ty: DeclarationId(1909), + ty: DeclarationId(1911), }, ], }, @@ -56871,7 +56923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2434, 2559), }); declarations.push(Declaration { - id: DeclarationId(1911), + id: DeclarationId(1913), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -56891,11 +56943,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3216, 3232), }); declarations.push(Declaration { - id: DeclarationId(1912), + id: DeclarationId(1914), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(743)], - output: DeclarationId(1911), + output: DeclarationId(1913), body: ArrowBody::NoBody, }, type_params: vec![], @@ -56909,7 +56961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3195, 3232), }); declarations.push(Declaration { - id: DeclarationId(1913), + id: DeclarationId(1915), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(871), DeclarationId(871)], @@ -56927,7 +56979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3244, 3275), }); declarations.push(Declaration { - id: DeclarationId(1914), + id: DeclarationId(1916), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(743), DeclarationId(871)], @@ -56945,7 +56997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3316, 3359), }); declarations.push(Declaration { - id: DeclarationId(1915), + id: DeclarationId(1917), name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), @@ -56965,7 +57017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052), }); declarations.push(Declaration { - id: DeclarationId(1916), + id: DeclarationId(1918), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56985,7 +57037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873), }); declarations.push(Declaration { - id: DeclarationId(1917), + id: DeclarationId(1919), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56999,7 +57051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204), }); declarations.push(Declaration { - id: DeclarationId(1918), + id: DeclarationId(1920), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57018,7 +57070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237), }); declarations.push(Declaration { - id: DeclarationId(1919), + id: DeclarationId(1921), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57037,7 +57089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746), }); declarations.push(Declaration { - id: DeclarationId(1920), + id: DeclarationId(1922), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57056,7 +57108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773), }); declarations.push(Declaration { - id: DeclarationId(1921), + id: DeclarationId(1923), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57076,7 +57128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165), }); declarations.push(Declaration { - id: DeclarationId(1922), + id: DeclarationId(1924), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57090,7 +57142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170), }); declarations.push(Declaration { - id: DeclarationId(1923), + id: DeclarationId(1925), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57104,7 +57156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183), }); declarations.push(Declaration { - id: DeclarationId(1924), + id: DeclarationId(1926), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57118,7 +57170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629), }); declarations.push(Declaration { - id: DeclarationId(1925), + id: DeclarationId(1927), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57132,7 +57184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642), }); declarations.push(Declaration { - id: DeclarationId(1926), + id: DeclarationId(1928), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57146,7 +57198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991), }); declarations.push(Declaration { - id: DeclarationId(1927), + id: DeclarationId(1929), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57160,7 +57212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002), }); declarations.push(Declaration { - id: DeclarationId(1928), + id: DeclarationId(1930), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57174,7 +57226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268), }); declarations.push(Declaration { - id: DeclarationId(1929), + id: DeclarationId(1931), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57188,7 +57240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278), }); declarations.push(Declaration { - id: DeclarationId(1930), + id: DeclarationId(1932), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57202,7 +57254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296), }); declarations.push(Declaration { - id: DeclarationId(1931), + id: DeclarationId(1933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57216,7 +57268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651), }); declarations.push(Declaration { - id: DeclarationId(1932), + id: DeclarationId(1934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57230,7 +57282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8203, 8212), }); declarations.push(Declaration { - id: DeclarationId(1933), + id: DeclarationId(1935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57244,7 +57296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8217, 8230), }); declarations.push(Declaration { - id: DeclarationId(1934), + id: DeclarationId(1936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57258,7 +57310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8235, 8243), }); declarations.push(Declaration { - id: DeclarationId(1935), + id: DeclarationId(1937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57272,7 +57324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8248, 8258), }); declarations.push(Declaration { - id: DeclarationId(1936), + id: DeclarationId(1938), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57286,7 +57338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8263, 8273), }); declarations.push(Declaration { - id: DeclarationId(1937), + id: DeclarationId(1939), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57300,7 +57352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8278, 8289), }); declarations.push(Declaration { - id: DeclarationId(1938), + id: DeclarationId(1940), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57314,7 +57366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8294, 8302), }); declarations.push(Declaration { - id: DeclarationId(1939), + id: DeclarationId(1941), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57328,7 +57380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8307, 8314), }); declarations.push(Declaration { - id: DeclarationId(1940), + id: DeclarationId(1942), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57342,7 +57394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8319, 8329), }); declarations.push(Declaration { - id: DeclarationId(1941), + id: DeclarationId(1943), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57356,7 +57408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8334, 8346), }); declarations.push(Declaration { - id: DeclarationId(1942), + id: DeclarationId(1944), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57370,7 +57422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11039, 11065), }); declarations.push(Declaration { - id: DeclarationId(1943), + id: DeclarationId(1945), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57384,7 +57436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11070, 11080), }); declarations.push(Declaration { - id: DeclarationId(1944), + id: DeclarationId(1946), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57398,7 +57450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14808, 14814), }); declarations.push(Declaration { - id: DeclarationId(1945), + id: DeclarationId(1947), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57412,7 +57464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14819, 14830), }); declarations.push(Declaration { - id: DeclarationId(1946), + id: DeclarationId(1948), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57426,7 +57478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15150, 15161), }); declarations.push(Declaration { - id: DeclarationId(1947), + id: DeclarationId(1949), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57440,7 +57492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15166, 15177), }); declarations.push(Declaration { - id: DeclarationId(1948), + id: DeclarationId(1950), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57454,7 +57506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17110, 17121), }); declarations.push(Declaration { - id: DeclarationId(1949), + id: DeclarationId(1951), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57468,7 +57520,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17126, 17134), }); declarations.push(Declaration { - id: DeclarationId(1950), + id: DeclarationId(1952), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57487,7 +57539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 18297, 18332), }); declarations.push(Declaration { - id: DeclarationId(1951), + id: DeclarationId(1953), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57512,7 +57564,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 18337, 18425), }); declarations.push(Declaration { - id: DeclarationId(1952), + id: DeclarationId(1954), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57532,7 +57584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 2458, 2486), }); declarations.push(Declaration { - id: DeclarationId(1953), + id: DeclarationId(1955), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(833), @@ -57549,7 +57601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517), }); declarations.push(Declaration { - id: DeclarationId(1954), + id: DeclarationId(1956), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(836), @@ -57566,7 +57618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905), }); declarations.push(Declaration { - id: DeclarationId(1955), + id: DeclarationId(1957), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57586,7 +57638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812), }); declarations.push(Declaration { - id: DeclarationId(1956), + id: DeclarationId(1958), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57603,7 +57655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954), }); declarations.push(Declaration { - id: DeclarationId(1957), + id: DeclarationId(1959), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57620,7 +57672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 32246, 32250), }); declarations.push(Declaration { - id: DeclarationId(1958), + id: DeclarationId(1960), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57637,7 +57689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33495, 33499), }); declarations.push(Declaration { - id: DeclarationId(1959), + id: DeclarationId(1961), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57654,7 +57706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33970, 33974), }); declarations.push(Declaration { - id: DeclarationId(1960), + id: DeclarationId(1962), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57671,7 +57723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35233, 35237), }); declarations.push(Declaration { - id: DeclarationId(1961), + id: DeclarationId(1963), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -57688,7 +57740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35505, 35509), }); declarations.push(Declaration { - id: DeclarationId(1962), + id: DeclarationId(1964), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57702,7 +57754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5562, 5577), }); declarations.push(Declaration { - id: DeclarationId(1963), + id: DeclarationId(1965), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57716,7 +57768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5617, 5630), }); declarations.push(Declaration { - id: DeclarationId(1964), + id: DeclarationId(1966), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57730,7 +57782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5678, 5695), }); declarations.push(Declaration { - id: DeclarationId(1965), + id: DeclarationId(1967), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57744,7 +57796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5734, 5746), }); declarations.push(Declaration { - id: DeclarationId(1966), + id: DeclarationId(1968), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57758,7 +57810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811), }); declarations.push(Declaration { - id: DeclarationId(1967), + id: DeclarationId(1969), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57783,7 +57835,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966), }); declarations.push(Declaration { - id: DeclarationId(1968), + id: DeclarationId(1970), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57802,7 +57854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013), }); declarations.push(Declaration { - id: DeclarationId(1969), + id: DeclarationId(1971), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57827,7 +57879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075), }); declarations.push(Declaration { - id: DeclarationId(1970), + id: DeclarationId(1972), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57841,7 +57893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094), }); declarations.push(Declaration { - id: DeclarationId(1971), + id: DeclarationId(1973), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57855,7 +57907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114), }); declarations.push(Declaration { - id: DeclarationId(1972), + id: DeclarationId(1974), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57869,12 +57921,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096), }); declarations.push(Declaration { - id: DeclarationId(1973), + id: DeclarationId(1975), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -57888,17 +57940,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148), }); declarations.push(Declaration { - id: DeclarationId(1974), + id: DeclarationId(1976), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "numerator".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, Field { label: "root".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, ], }, @@ -57913,17 +57965,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230), }); declarations.push(Declaration { - id: DeclarationId(1975), + id: DeclarationId(1977), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "base".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }, Field { label: "argument".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }, ], }, @@ -57938,7 +57990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309), }); declarations.push(Declaration { - id: DeclarationId(1976), + id: DeclarationId(1978), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57963,7 +58015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985), }); declarations.push(Declaration { - id: DeclarationId(1977), + id: DeclarationId(1979), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57982,7 +58034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026), }); declarations.push(Declaration { - id: DeclarationId(1978), + id: DeclarationId(1980), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57996,7 +58048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688), }); declarations.push(Declaration { - id: DeclarationId(1979), + id: DeclarationId(1981), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58015,7 +58067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764), }); declarations.push(Declaration { - id: DeclarationId(1980), + id: DeclarationId(1982), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58035,12 +58087,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843), }); declarations.push(Declaration { - id: DeclarationId(1981), + id: DeclarationId(1983), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "factors".to_string(), - ty: DeclarationId(1980), + ty: DeclarationId(1982), }], }, type_params: vec![], @@ -58054,7 +58106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845), }); declarations.push(Declaration { - id: DeclarationId(1982), + id: DeclarationId(1984), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58074,13 +58126,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923), }); declarations.push(Declaration { - id: DeclarationId(1983), + id: DeclarationId(1985), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1982), + value: DeclarationId(1984), }], }, type_params: vec![], @@ -58094,12 +58146,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924), }); declarations.push(Declaration { - id: DeclarationId(1984), + id: DeclarationId(1986), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(1983), + ty: DeclarationId(1985), }], }, type_params: vec![], @@ -58113,7 +58165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926), }); declarations.push(Declaration { - id: DeclarationId(1985), + id: DeclarationId(1987), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58133,12 +58185,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239), }); declarations.push(Declaration { - id: DeclarationId(1986), + id: DeclarationId(1988), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(1985), + ty: DeclarationId(1987), }], }, type_params: vec![], @@ -58152,7 +58204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241), }); declarations.push(Declaration { - id: DeclarationId(1987), + id: DeclarationId(1989), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58166,7 +58218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336), }); declarations.push(Declaration { - id: DeclarationId(1988), + id: DeclarationId(1990), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58180,13 +58232,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416), }); declarations.push(Declaration { - id: DeclarationId(1989), + id: DeclarationId(1991), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], @@ -58200,13 +58252,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254), }); declarations.push(Declaration { - id: DeclarationId(1990), + id: DeclarationId(1992), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1081), + value: DeclarationId(1083), }], }, type_params: vec![], @@ -58220,7 +58272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434), }); declarations.push(Declaration { - id: DeclarationId(1991), + id: DeclarationId(1993), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(865), @@ -58240,11 +58292,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190), }); declarations.push(Declaration { - id: DeclarationId(1992), + id: DeclarationId(1994), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(743)], - output: DeclarationId(1991), + output: DeclarationId(1993), body: ArrowBody::NoBody, }, type_params: vec![], @@ -58258,7 +58310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190), }); declarations.push(Declaration { - id: DeclarationId(1993), + id: DeclarationId(1995), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -58278,7 +58330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214), }); declarations.push(Declaration { - id: DeclarationId(1994), + id: DeclarationId(1996), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(992), DeclarationId(992)], @@ -58296,7 +58348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238), }); declarations.push(Declaration { - id: DeclarationId(1995), + id: DeclarationId(1997), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(992), DeclarationId(734)], @@ -58314,7 +58366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271), }); declarations.push(Declaration { - id: DeclarationId(1996), + id: DeclarationId(1998), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(992)], @@ -58332,7 +58384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316), }); declarations.push(Declaration { - id: DeclarationId(1997), + id: DeclarationId(1999), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -58352,7 +58404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588), }); declarations.push(Declaration { - id: DeclarationId(1998), + id: DeclarationId(2000), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(993), @@ -58372,7 +58424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641), }); declarations.push(Declaration { - id: DeclarationId(1999), + id: DeclarationId(2001), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58386,7 +58438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536), }); declarations.push(Declaration { - id: DeclarationId(2000), + id: DeclarationId(2002), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58405,7 +58457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551), }); declarations.push(Declaration { - id: DeclarationId(2001), + id: DeclarationId(2003), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58425,7 +58477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196), }); declarations.push(Declaration { - id: DeclarationId(2002), + id: DeclarationId(2004), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1010), @@ -58442,7 +58494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(2003), + id: DeclarationId(2005), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58462,12 +58514,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764), }); declarations.push(Declaration { - id: DeclarationId(2004), + id: DeclarationId(2006), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2003), + ty: DeclarationId(2005), }], }, type_params: vec![], @@ -58481,7 +58533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765), }); declarations.push(Declaration { - id: DeclarationId(2005), + id: DeclarationId(2007), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58501,12 +58553,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795), }); declarations.push(Declaration { - id: DeclarationId(2006), + id: DeclarationId(2008), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2005), + ty: DeclarationId(2007), }], }, type_params: vec![], @@ -58520,7 +58572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796), }); declarations.push(Declaration { - id: DeclarationId(2007), + id: DeclarationId(2009), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58545,7 +58597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113), }); declarations.push(Declaration { - id: DeclarationId(2008), + id: DeclarationId(2010), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58565,7 +58617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182), }); declarations.push(Declaration { - id: DeclarationId(2009), + id: DeclarationId(2011), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58575,7 +58627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2008), + ty: DeclarationId(2010), }, Field { label: "span".to_string(), @@ -58594,7 +58646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211), }); declarations.push(Declaration { - id: DeclarationId(2010), + id: DeclarationId(2012), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58619,7 +58671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280), }); declarations.push(Declaration { - id: DeclarationId(2011), + id: DeclarationId(2013), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58639,13 +58691,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324), }); declarations.push(Declaration { - id: DeclarationId(2012), + id: DeclarationId(2014), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), - ty: DeclarationId(2011), + ty: DeclarationId(2013), }, Field { label: "output".to_string(), @@ -58668,7 +58720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379), }); declarations.push(Declaration { - id: DeclarationId(2013), + id: DeclarationId(2015), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58693,7 +58745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795), }); declarations.push(Declaration { - id: DeclarationId(2014), + id: DeclarationId(2016), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58722,7 +58774,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883), }); declarations.push(Declaration { - id: DeclarationId(2015), + id: DeclarationId(2017), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58742,7 +58794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962), }); declarations.push(Declaration { - id: DeclarationId(2016), + id: DeclarationId(2018), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58752,7 +58804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2015), + ty: DeclarationId(2017), }, Field { label: "span".to_string(), @@ -58771,7 +58823,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991), }); declarations.push(Declaration { - id: DeclarationId(2017), + id: DeclarationId(2019), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58790,7 +58842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4578, 4586), }); declarations.push(Declaration { - id: DeclarationId(2018), + id: DeclarationId(2020), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58809,7 +58861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4591, 4601), }); declarations.push(Declaration { - id: DeclarationId(2019), + id: DeclarationId(2021), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58828,7 +58880,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4606, 4620), }); declarations.push(Declaration { - id: DeclarationId(2020), + id: DeclarationId(2022), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58853,7 +58905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4734, 4785), }); declarations.push(Declaration { - id: DeclarationId(2021), + id: DeclarationId(2023), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58878,7 +58930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4790, 4828), }); declarations.push(Declaration { - id: DeclarationId(2022), + id: DeclarationId(2024), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58898,7 +58950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4856, 4868), }); declarations.push(Declaration { - id: DeclarationId(2023), + id: DeclarationId(2025), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58918,17 +58970,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4890, 4906), }); declarations.push(Declaration { - id: DeclarationId(2024), + id: DeclarationId(2026), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), - ty: DeclarationId(2022), + ty: DeclarationId(2024), }, Field { label: "segment_spans".to_string(), - ty: DeclarationId(2023), + ty: DeclarationId(2025), }, Field { label: "span".to_string(), @@ -58947,7 +58999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4833, 4935), }); declarations.push(Declaration { - id: DeclarationId(2025), + id: DeclarationId(2027), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58967,7 +59019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4980, 4997), }); declarations.push(Declaration { - id: DeclarationId(2026), + id: DeclarationId(2028), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58977,7 +59029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2025), + ty: DeclarationId(2027), }, Field { label: "span".to_string(), @@ -58996,7 +59048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4940, 5026), }); declarations.push(Declaration { - id: DeclarationId(2027), + id: DeclarationId(2029), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59016,7 +59068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5082, 5106), }); declarations.push(Declaration { - id: DeclarationId(2028), + id: DeclarationId(2030), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59026,7 +59078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), - ty: DeclarationId(2027), + ty: DeclarationId(2029), }, Field { label: "span".to_string(), @@ -59045,7 +59097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5031, 5135), }); declarations.push(Declaration { - id: DeclarationId(2029), + id: DeclarationId(2031), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59065,7 +59117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5186, 5203), }); declarations.push(Declaration { - id: DeclarationId(2030), + id: DeclarationId(2032), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59075,7 +59127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2029), + ty: DeclarationId(2031), }, Field { label: "span".to_string(), @@ -59094,7 +59146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5140, 5232), }); declarations.push(Declaration { - id: DeclarationId(2031), + id: DeclarationId(2033), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59114,13 +59166,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5260, 5272), }); declarations.push(Declaration { - id: DeclarationId(2032), + id: DeclarationId(2034), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "params".to_string(), - ty: DeclarationId(2031), + ty: DeclarationId(2033), }, Field { label: "body".to_string(), @@ -59143,7 +59195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5237, 5325), }); declarations.push(Declaration { - id: DeclarationId(2033), + id: DeclarationId(2035), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59176,7 +59228,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5330, 5449), }); declarations.push(Declaration { - id: DeclarationId(2034), + id: DeclarationId(2036), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59196,7 +59248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5503, 5524), }); declarations.push(Declaration { - id: DeclarationId(2035), + id: DeclarationId(2037), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59206,7 +59258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arms".to_string(), - ty: DeclarationId(2034), + ty: DeclarationId(2036), }, Field { label: "span".to_string(), @@ -59225,7 +59277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5454, 5553), }); declarations.push(Declaration { - id: DeclarationId(2036), + id: DeclarationId(2038), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59245,13 +59297,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5581, 5605), }); declarations.push(Declaration { - id: DeclarationId(2037), + id: DeclarationId(2039), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "fields".to_string(), - ty: DeclarationId(2036), + ty: DeclarationId(2038), }, Field { label: "span".to_string(), @@ -59270,7 +59322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5558, 5634), }); declarations.push(Declaration { - id: DeclarationId(2038), + id: DeclarationId(2040), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59290,13 +59342,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5662, 5679), }); declarations.push(Declaration { - id: DeclarationId(2039), + id: DeclarationId(2041), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "elements".to_string(), - ty: DeclarationId(2038), + ty: DeclarationId(2040), }, Field { label: "span".to_string(), @@ -59315,7 +59367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5639, 5708), }); declarations.push(Declaration { - id: DeclarationId(2040), + id: DeclarationId(2042), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59335,13 +59387,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 7802, 7823), }); declarations.push(Declaration { - id: DeclarationId(2041), + id: DeclarationId(2043), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "entries".to_string(), - ty: DeclarationId(2040), + ty: DeclarationId(2042), }, Field { label: "span".to_string(), @@ -59360,7 +59412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 7781, 7852), }); declarations.push(Declaration { - id: DeclarationId(2042), + id: DeclarationId(2044), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1003), @@ -59377,7 +59429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8783, 8795), }); declarations.push(Declaration { - id: DeclarationId(2043), + id: DeclarationId(2045), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59387,7 +59439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_ann".to_string(), - ty: DeclarationId(2042), + ty: DeclarationId(2044), }, Field { label: "expr".to_string(), @@ -59406,7 +59458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8742, 8825), }); declarations.push(Declaration { - id: DeclarationId(2044), + id: DeclarationId(2046), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59426,7 +59478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8873, 8885), }); declarations.push(Declaration { - id: DeclarationId(2045), + id: DeclarationId(2047), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59446,7 +59498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8900, 8918), }); declarations.push(Declaration { - id: DeclarationId(2046), + id: DeclarationId(2048), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59456,11 +59508,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2044), + ty: DeclarationId(2046), }, Field { label: "params".to_string(), - ty: DeclarationId(2045), + ty: DeclarationId(2047), }, Field { label: "return_type".to_string(), @@ -59487,7 +59539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8830, 9002), }); declarations.push(Declaration { - id: DeclarationId(2047), + id: DeclarationId(2049), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59507,7 +59559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9062, 9074), }); declarations.push(Declaration { - id: DeclarationId(2048), + id: DeclarationId(2050), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59527,7 +59579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9089, 9107), }); declarations.push(Declaration { - id: DeclarationId(2049), + id: DeclarationId(2051), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59537,11 +59589,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2047), + ty: DeclarationId(2049), }, Field { label: "params".to_string(), - ty: DeclarationId(2048), + ty: DeclarationId(2050), }, Field { label: "return_type".to_string(), @@ -59568,7 +59620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9007, 9195), }); declarations.push(Declaration { - id: DeclarationId(2050), + id: DeclarationId(2052), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1010), @@ -59585,7 +59637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9260, 9272), }); declarations.push(Declaration { - id: DeclarationId(2051), + id: DeclarationId(2053), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59599,7 +59651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "body".to_string(), - ty: DeclarationId(2050), + ty: DeclarationId(2052), }, Field { label: "body_span".to_string(), @@ -59622,7 +59674,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9200, 9329), }); declarations.push(Declaration { - id: DeclarationId(2052), + id: DeclarationId(2054), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59642,13 +59694,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9349, 9361), }); declarations.push(Declaration { - id: DeclarationId(2053), + id: DeclarationId(2055), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2052), + ty: DeclarationId(2054), }, Field { label: "span".to_string(), @@ -59667,7 +59719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9334, 9381), }); declarations.push(Declaration { - id: DeclarationId(2054), + id: DeclarationId(2056), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59687,7 +59739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419), }); declarations.push(Declaration { - id: DeclarationId(2055), + id: DeclarationId(2057), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59707,17 +59759,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9433, 9445), }); declarations.push(Declaration { - id: DeclarationId(2056), + id: DeclarationId(2058), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2054), + ty: DeclarationId(2056), }, Field { label: "names".to_string(), - ty: DeclarationId(2055), + ty: DeclarationId(2057), }, Field { label: "span".to_string(), @@ -59736,7 +59788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9386, 9474), }); declarations.push(Declaration { - id: DeclarationId(2057), + id: DeclarationId(2059), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59756,7 +59808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9528, 9540), }); declarations.push(Declaration { - id: DeclarationId(2058), + id: DeclarationId(2060), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59766,7 +59818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2057), + ty: DeclarationId(2059), }, Field { label: "span".to_string(), @@ -59785,7 +59837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9479, 9569), }); declarations.push(Declaration { - id: DeclarationId(2059), + id: DeclarationId(2061), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59805,7 +59857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9625, 9637), }); declarations.push(Declaration { - id: DeclarationId(2060), + id: DeclarationId(2062), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59825,7 +59877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9652, 9670), }); declarations.push(Declaration { - id: DeclarationId(2061), + id: DeclarationId(2063), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59835,11 +59887,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2059), + ty: DeclarationId(2061), }, Field { label: "fields".to_string(), - ty: DeclarationId(2060), + ty: DeclarationId(2062), }, Field { label: "span".to_string(), @@ -59858,7 +59910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9574, 9699), }); declarations.push(Declaration { - id: DeclarationId(2062), + id: DeclarationId(2064), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59878,7 +59930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9752, 9764), }); declarations.push(Declaration { - id: DeclarationId(2063), + id: DeclarationId(2065), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59898,7 +59950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9781, 9801), }); declarations.push(Declaration { - id: DeclarationId(2064), + id: DeclarationId(2066), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1003), @@ -59915,7 +59967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9818, 9830), }); declarations.push(Declaration { - id: DeclarationId(2065), + id: DeclarationId(2067), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59925,15 +59977,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2062), + ty: DeclarationId(2064), }, Field { label: "variants".to_string(), - ty: DeclarationId(2063), + ty: DeclarationId(2065), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(2064), + ty: DeclarationId(2066), }, Field { label: "span".to_string(), @@ -59952,7 +60004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9704, 9859), }); declarations.push(Declaration { - id: DeclarationId(2066), + id: DeclarationId(2068), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59972,7 +60024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9914, 9926), }); declarations.push(Declaration { - id: DeclarationId(2067), + id: DeclarationId(2069), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1010), @@ -59989,7 +60041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9998, 10010), }); declarations.push(Declaration { - id: DeclarationId(2068), + id: DeclarationId(2070), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59999,7 +60051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2066), + ty: DeclarationId(2068), }, Field { label: "nominal_opaque".to_string(), @@ -60011,7 +60063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), - ty: DeclarationId(2067), + ty: DeclarationId(2069), }, Field { label: "span".to_string(), @@ -60030,7 +60082,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9864, 10039), }); declarations.push(Declaration { - id: DeclarationId(2069), + id: DeclarationId(2071), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60054,7 +60106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { - id: DeclarationId(2070), + id: DeclarationId(2072), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60073,7 +60125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157), }); declarations.push(Declaration { - id: DeclarationId(2071), + id: DeclarationId(2073), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60093,12 +60145,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190), }); declarations.push(Declaration { - id: DeclarationId(2072), + id: DeclarationId(2074), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2071), + ty: DeclarationId(2073), }], }, type_params: vec![], @@ -60112,7 +60164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191), }); declarations.push(Declaration { - id: DeclarationId(2073), + id: DeclarationId(2075), name: None, connective: TypeConnective::Conj { children: vec![ @@ -60137,7 +60189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247), }); declarations.push(Declaration { - id: DeclarationId(2074), + id: DeclarationId(2076), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60156,7 +60208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267), }); declarations.push(Declaration { - id: DeclarationId(2075), + id: DeclarationId(2077), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60175,7 +60227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299), }); declarations.push(Declaration { - id: DeclarationId(2076), + id: DeclarationId(2078), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60201,7 +60253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949), }); declarations.push(Declaration { - id: DeclarationId(2077), + id: DeclarationId(2079), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60218,15 +60270,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 4580, 4595), + span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552), }); declarations.push(Declaration { - id: DeclarationId(2078), + id: DeclarationId(2080), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "input_order".to_string(), - ty: DeclarationId(1022), + ty: DeclarationId(1023), }], }, type_params: vec![], @@ -60237,10 +60289,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5022, 5076), + span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459), }); declarations.push(Declaration { - id: DeclarationId(2079), + id: DeclarationId(2081), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60251,10 +60303,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5341, 5350), + span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733), }); declarations.push(Declaration { - id: DeclarationId(2080), + id: DeclarationId(2082), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60274,7 +60326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617), }); declarations.push(Declaration { - id: DeclarationId(2081), + id: DeclarationId(2083), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60285,7 +60337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), - value: DeclarationId(1024), + value: DeclarationId(1026), }, ], }, @@ -60300,10 +60352,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861), }); declarations.push(Declaration { - id: DeclarationId(2082), + id: DeclarationId(2084), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1028), + DeclarationId(1030), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60317,10 +60369,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345), }); declarations.push(Declaration { - id: DeclarationId(2083), + id: DeclarationId(2085), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1028), + DeclarationId(1030), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60334,10 +60386,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366), }); declarations.push(Declaration { - id: DeclarationId(2084), + id: DeclarationId(2086), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1028), + DeclarationId(1030), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60351,7 +60403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387), }); declarations.push(Declaration { - id: DeclarationId(2085), + id: DeclarationId(2087), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60362,7 +60414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), - value: DeclarationId(1028), + value: DeclarationId(1030), }, ], }, @@ -60377,7 +60429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660), }); declarations.push(Declaration { - id: DeclarationId(2086), + id: DeclarationId(2088), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -60388,7 +60440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), - value: DeclarationId(1028), + value: DeclarationId(1030), }, ], }, @@ -60403,10 +60455,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732), }); declarations.push(Declaration { - id: DeclarationId(2087), + id: DeclarationId(2089), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1036), + DeclarationId(1038), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60420,10 +60472,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901), }); declarations.push(Declaration { - id: DeclarationId(2088), + id: DeclarationId(2090), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1037), + DeclarationId(1039), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -60437,7 +60489,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6321, 6341), }); declarations.push(Declaration { - id: DeclarationId(2089), + id: DeclarationId(2091), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60451,7 +60503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 667, 673), }); declarations.push(Declaration { - id: DeclarationId(2090), + id: DeclarationId(2092), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60465,7 +60517,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 678, 691), }); declarations.push(Declaration { - id: DeclarationId(2091), + id: DeclarationId(2093), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60479,7 +60531,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 696, 710), }); declarations.push(Declaration { - id: DeclarationId(2092), + id: DeclarationId(2094), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60498,7 +60550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258), }); declarations.push(Declaration { - id: DeclarationId(2093), + id: DeclarationId(2095), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60517,7 +60569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291), }); declarations.push(Declaration { - id: DeclarationId(2094), + id: DeclarationId(2096), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60536,7 +60588,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329), }); declarations.push(Declaration { - id: DeclarationId(2095), + id: DeclarationId(2097), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60555,7 +60607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365), }); declarations.push(Declaration { - id: DeclarationId(2096), + id: DeclarationId(2098), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60574,7 +60626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402), }); declarations.push(Declaration { - id: DeclarationId(2097), + id: DeclarationId(2099), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60588,12 +60640,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416), }); declarations.push(Declaration { - id: DeclarationId(2098), + id: DeclarationId(2100), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -60607,7 +60659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471), }); declarations.push(Declaration { - id: DeclarationId(2099), + id: DeclarationId(2101), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60621,12 +60673,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977), }); declarations.push(Declaration { - id: DeclarationId(2100), + id: DeclarationId(2102), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inner".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }], }, type_params: vec![], @@ -60640,7 +60692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027), }); declarations.push(Declaration { - id: DeclarationId(2101), + id: DeclarationId(2103), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60659,12 +60711,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165), }); declarations.push(Declaration { - id: DeclarationId(2102), + id: DeclarationId(2104), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "amount".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -60678,12 +60730,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214), }); declarations.push(Declaration { - id: DeclarationId(2103), + id: DeclarationId(2105), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), - ty: DeclarationId(1036), + ty: DeclarationId(1038), }], }, type_params: vec![], @@ -60697,12 +60749,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277), }); declarations.push(Declaration { - id: DeclarationId(2104), + id: DeclarationId(2106), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), - ty: DeclarationId(1037), + ty: DeclarationId(1039), }], }, type_params: vec![], @@ -60716,7 +60768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338), }); declarations.push(Declaration { - id: DeclarationId(2105), + id: DeclarationId(2107), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60735,7 +60787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376), }); declarations.push(Declaration { - id: DeclarationId(2106), + id: DeclarationId(2108), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60754,7 +60806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411), }); declarations.push(Declaration { - id: DeclarationId(2107), + id: DeclarationId(2109), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60768,13 +60820,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429), }); declarations.push(Declaration { - id: DeclarationId(2108), + id: DeclarationId(2110), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1035), + value: DeclarationId(1037), }], }, type_params: vec![], @@ -60788,13 +60840,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491), }); declarations.push(Declaration { - id: DeclarationId(2109), + id: DeclarationId(2111), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1028), + value: DeclarationId(1030), }], }, type_params: vec![], @@ -60808,7 +60860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722), }); declarations.push(Declaration { - id: DeclarationId(2110), + id: DeclarationId(2112), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60822,7 +60874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), }); declarations.push(Declaration { - id: DeclarationId(2111), + id: DeclarationId(2113), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60836,7 +60888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), }); declarations.push(Declaration { - id: DeclarationId(2112), + id: DeclarationId(2114), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60850,7 +60902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), }); declarations.push(Declaration { - id: DeclarationId(2113), + id: DeclarationId(2115), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60864,7 +60916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), }); declarations.push(Declaration { - id: DeclarationId(2114), + id: DeclarationId(2116), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60878,7 +60930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), }); declarations.push(Declaration { - id: DeclarationId(2115), + id: DeclarationId(2117), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60892,7 +60944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), }); declarations.push(Declaration { - id: DeclarationId(2116), + id: DeclarationId(2118), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60906,7 +60958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 716), }); declarations.push(Declaration { - id: DeclarationId(2117), + id: DeclarationId(2119), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60920,7 +60972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 721, 729), }); declarations.push(Declaration { - id: DeclarationId(2118), + id: DeclarationId(2120), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60934,7 +60986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 734, 742), }); declarations.push(Declaration { - id: DeclarationId(2119), + id: DeclarationId(2121), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60948,7 +61000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 747, 754), }); declarations.push(Declaration { - id: DeclarationId(2120), + id: DeclarationId(2122), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60962,7 +61014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 759, 765), }); declarations.push(Declaration { - id: DeclarationId(2121), + id: DeclarationId(2123), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60976,7 +61028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 770, 777), }); declarations.push(Declaration { - id: DeclarationId(2122), + id: DeclarationId(2124), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60990,7 +61042,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 782, 788), }); declarations.push(Declaration { - id: DeclarationId(2123), + id: DeclarationId(2125), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61004,7 +61056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 793, 800), }); declarations.push(Declaration { - id: DeclarationId(2124), + id: DeclarationId(2126), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61023,7 +61075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 805, 818), }); declarations.push(Declaration { - id: DeclarationId(2125), + id: DeclarationId(2127), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61042,7 +61094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 823, 834), }); declarations.push(Declaration { - id: DeclarationId(2126), + id: DeclarationId(2128), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61061,7 +61113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 839, 856), }); declarations.push(Declaration { - id: DeclarationId(2127), + id: DeclarationId(2129), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61075,7 +61127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 861, 863), }); declarations.push(Declaration { - id: DeclarationId(2128), + id: DeclarationId(2130), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61089,7 +61141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 868, 872), }); declarations.push(Declaration { - id: DeclarationId(2129), + id: DeclarationId(2131), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61103,7 +61155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 877, 882), }); declarations.push(Declaration { - id: DeclarationId(2130), + id: DeclarationId(2132), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61117,7 +61169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 887, 889), }); declarations.push(Declaration { - id: DeclarationId(2131), + id: DeclarationId(2133), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61131,7 +61183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 894, 896), }); declarations.push(Declaration { - id: DeclarationId(2132), + id: DeclarationId(2134), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61145,7 +61197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 901, 903), }); declarations.push(Declaration { - id: DeclarationId(2133), + id: DeclarationId(2135), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61159,7 +61211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 908, 910), }); declarations.push(Declaration { - id: DeclarationId(2134), + id: DeclarationId(2136), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61173,7 +61225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 915, 919), }); declarations.push(Declaration { - id: DeclarationId(2135), + id: DeclarationId(2137), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61187,7 +61239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 924, 929), }); declarations.push(Declaration { - id: DeclarationId(2136), + id: DeclarationId(2138), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61201,7 +61253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 934, 938), }); declarations.push(Declaration { - id: DeclarationId(2137), + id: DeclarationId(2139), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61215,7 +61267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 943, 948), }); declarations.push(Declaration { - id: DeclarationId(2138), + id: DeclarationId(2140), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61229,7 +61281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 953, 959), }); declarations.push(Declaration { - id: DeclarationId(2139), + id: DeclarationId(2141), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61243,7 +61295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 964, 972), }); declarations.push(Declaration { - id: DeclarationId(2140), + id: DeclarationId(2142), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61257,7 +61309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 977, 982), }); declarations.push(Declaration { - id: DeclarationId(2141), + id: DeclarationId(2143), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61271,7 +61323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 987, 992), }); declarations.push(Declaration { - id: DeclarationId(2142), + id: DeclarationId(2144), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61285,7 +61337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 997, 1005), }); declarations.push(Declaration { - id: DeclarationId(2143), + id: DeclarationId(2145), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61299,7 +61351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1010, 1019), }); declarations.push(Declaration { - id: DeclarationId(2144), + id: DeclarationId(2146), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61313,7 +61365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1024, 1027), }); declarations.push(Declaration { - id: DeclarationId(2145), + id: DeclarationId(2147), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61327,7 +61379,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1032, 1038), }); declarations.push(Declaration { - id: DeclarationId(2146), + id: DeclarationId(2148), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61341,7 +61393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1043, 1049), }); declarations.push(Declaration { - id: DeclarationId(2147), + id: DeclarationId(2149), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61355,7 +61407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1054, 1060), }); declarations.push(Declaration { - id: DeclarationId(2148), + id: DeclarationId(2150), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61369,7 +61421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1065, 1071), }); declarations.push(Declaration { - id: DeclarationId(2149), + id: DeclarationId(2151), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61383,7 +61435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1076, 1084), }); declarations.push(Declaration { - id: DeclarationId(2150), + id: DeclarationId(2152), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61397,7 +61449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1089, 1097), }); declarations.push(Declaration { - id: DeclarationId(2151), + id: DeclarationId(2153), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61411,7 +61463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1102, 1107), }); declarations.push(Declaration { - id: DeclarationId(2152), + id: DeclarationId(2154), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61425,7 +61477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1112, 1121), }); declarations.push(Declaration { - id: DeclarationId(2153), + id: DeclarationId(2155), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61439,7 +61491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1126, 1130), }); declarations.push(Declaration { - id: DeclarationId(2154), + id: DeclarationId(2156), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61453,7 +61505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1135, 1143), }); declarations.push(Declaration { - id: DeclarationId(2155), + id: DeclarationId(2157), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61467,7 +61519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1148, 1151), }); declarations.push(Declaration { - id: DeclarationId(2156), + id: DeclarationId(2158), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61481,7 +61533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1722, 1727), }); declarations.push(Declaration { - id: DeclarationId(2157), + id: DeclarationId(2159), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61495,7 +61547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1732, 1736), }); declarations.push(Declaration { - id: DeclarationId(2158), + id: DeclarationId(2160), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61509,7 +61561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1741, 1747), }); declarations.push(Declaration { - id: DeclarationId(2159), + id: DeclarationId(2161), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61523,7 +61575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1752, 1758), }); declarations.push(Declaration { - id: DeclarationId(2160), + id: DeclarationId(2162), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61537,7 +61589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1763, 1767), }); declarations.push(Declaration { - id: DeclarationId(2161), + id: DeclarationId(2163), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61551,7 +61603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1772, 1778), }); declarations.push(Declaration { - id: DeclarationId(2162), + id: DeclarationId(2164), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61565,7 +61617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1783, 1792), }); declarations.push(Declaration { - id: DeclarationId(2163), + id: DeclarationId(2165), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61579,7 +61631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1797, 1805), }); declarations.push(Declaration { - id: DeclarationId(2164), + id: DeclarationId(2166), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61593,7 +61645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1810, 1818), }); declarations.push(Declaration { - id: DeclarationId(2165), + id: DeclarationId(2167), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61607,7 +61659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1823, 1830), }); declarations.push(Declaration { - id: DeclarationId(2166), + id: DeclarationId(2168), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61621,7 +61673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1835, 1841), }); declarations.push(Declaration { - id: DeclarationId(2167), + id: DeclarationId(2169), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61635,7 +61687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1846, 1853), }); declarations.push(Declaration { - id: DeclarationId(2168), + id: DeclarationId(2170), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61649,7 +61701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1858, 1864), }); declarations.push(Declaration { - id: DeclarationId(2169), + id: DeclarationId(2171), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61663,7 +61715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1869, 1876), }); declarations.push(Declaration { - id: DeclarationId(2170), + id: DeclarationId(2172), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61677,7 +61729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2316, 2318), }); declarations.push(Declaration { - id: DeclarationId(2171), + id: DeclarationId(2173), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61691,7 +61743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2323, 2327), }); declarations.push(Declaration { - id: DeclarationId(2172), + id: DeclarationId(2174), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61705,7 +61757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2332, 2337), }); declarations.push(Declaration { - id: DeclarationId(2173), + id: DeclarationId(2175), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61719,7 +61771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2342, 2344), }); declarations.push(Declaration { - id: DeclarationId(2174), + id: DeclarationId(2176), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61733,7 +61785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2349, 2351), }); declarations.push(Declaration { - id: DeclarationId(2175), + id: DeclarationId(2177), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61747,7 +61799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2356, 2358), }); declarations.push(Declaration { - id: DeclarationId(2176), + id: DeclarationId(2178), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61761,7 +61813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2363, 2365), }); declarations.push(Declaration { - id: DeclarationId(2177), + id: DeclarationId(2179), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61775,7 +61827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2370, 2374), }); declarations.push(Declaration { - id: DeclarationId(2178), + id: DeclarationId(2180), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61789,7 +61841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2379, 2384), }); declarations.push(Declaration { - id: DeclarationId(2179), + id: DeclarationId(2181), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61803,7 +61855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2389, 2393), }); declarations.push(Declaration { - id: DeclarationId(2180), + id: DeclarationId(2182), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61817,7 +61869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2398, 2403), }); declarations.push(Declaration { - id: DeclarationId(2181), + id: DeclarationId(2183), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61831,7 +61883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2408, 2414), }); declarations.push(Declaration { - id: DeclarationId(2182), + id: DeclarationId(2184), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61845,7 +61897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2419, 2427), }); declarations.push(Declaration { - id: DeclarationId(2183), + id: DeclarationId(2185), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61859,7 +61911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2432, 2437), }); declarations.push(Declaration { - id: DeclarationId(2184), + id: DeclarationId(2186), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61873,7 +61925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2442, 2447), }); declarations.push(Declaration { - id: DeclarationId(2185), + id: DeclarationId(2187), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61887,7 +61939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2452, 2460), }); declarations.push(Declaration { - id: DeclarationId(2186), + id: DeclarationId(2188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61901,7 +61953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2465, 2474), }); declarations.push(Declaration { - id: DeclarationId(2187), + id: DeclarationId(2189), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61915,7 +61967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2479, 2482), }); declarations.push(Declaration { - id: DeclarationId(2188), + id: DeclarationId(2190), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61929,7 +61981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2487, 2493), }); declarations.push(Declaration { - id: DeclarationId(2189), + id: DeclarationId(2191), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61943,7 +61995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2498, 2504), }); declarations.push(Declaration { - id: DeclarationId(2190), + id: DeclarationId(2192), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61957,7 +62009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2509, 2515), }); declarations.push(Declaration { - id: DeclarationId(2191), + id: DeclarationId(2193), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61971,7 +62023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2520, 2526), }); declarations.push(Declaration { - id: DeclarationId(2192), + id: DeclarationId(2194), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61985,7 +62037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2531, 2539), }); declarations.push(Declaration { - id: DeclarationId(2193), + id: DeclarationId(2195), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61999,7 +62051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2544, 2552), }); declarations.push(Declaration { - id: DeclarationId(2194), + id: DeclarationId(2196), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62013,7 +62065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2557, 2562), }); declarations.push(Declaration { - id: DeclarationId(2195), + id: DeclarationId(2197), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62027,7 +62079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2567, 2576), }); declarations.push(Declaration { - id: DeclarationId(2196), + id: DeclarationId(2198), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62041,7 +62093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2581, 2585), }); declarations.push(Declaration { - id: DeclarationId(2197), + id: DeclarationId(2199), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62055,7 +62107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2590, 2598), }); declarations.push(Declaration { - id: DeclarationId(2198), + id: DeclarationId(2200), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62075,13 +62127,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14633, 14656), }); declarations.push(Declaration { - id: DeclarationId(2199), + id: DeclarationId(2201), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1068), + value: DeclarationId(1070), }], }, type_params: vec![], @@ -62095,13 +62147,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873), }); declarations.push(Declaration { - id: DeclarationId(2200), + id: DeclarationId(2202), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1070), + value: DeclarationId(1072), }], }, type_params: vec![], @@ -62115,7 +62167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14878, 14898), }); declarations.push(Declaration { - id: DeclarationId(2201), + id: DeclarationId(2203), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62129,7 +62181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494), }); declarations.push(Declaration { - id: DeclarationId(2202), + id: DeclarationId(2204), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62143,7 +62195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2499, 2509), }); declarations.push(Declaration { - id: DeclarationId(2203), + id: DeclarationId(2205), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62157,7 +62209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2514, 2526), }); declarations.push(Declaration { - id: DeclarationId(2204), + id: DeclarationId(2206), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62171,7 +62223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2531, 2543), }); declarations.push(Declaration { - id: DeclarationId(2205), + id: DeclarationId(2207), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62185,7 +62237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2548, 2561), }); declarations.push(Declaration { - id: DeclarationId(2206), + id: DeclarationId(2208), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62199,7 +62251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2566, 2578), }); declarations.push(Declaration { - id: DeclarationId(2207), + id: DeclarationId(2209), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62213,7 +62265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606), }); declarations.push(Declaration { - id: DeclarationId(2208), + id: DeclarationId(2210), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62227,7 +62279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021), }); declarations.push(Declaration { - id: DeclarationId(2209), + id: DeclarationId(2211), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62246,7 +62298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042), }); declarations.push(Declaration { - id: DeclarationId(2210), + id: DeclarationId(2212), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62260,7 +62312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709), }); declarations.push(Declaration { - id: DeclarationId(2211), + id: DeclarationId(2213), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62274,7 +62326,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724), }); declarations.push(Declaration { - id: DeclarationId(2212), + id: DeclarationId(2214), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62288,7 +62340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552), }); declarations.push(Declaration { - id: DeclarationId(2213), + id: DeclarationId(2215), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62302,7 +62354,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570), }); declarations.push(Declaration { - id: DeclarationId(2214), + id: DeclarationId(2216), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62316,7 +62368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583), }); declarations.push(Declaration { - id: DeclarationId(2215), + id: DeclarationId(2217), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62330,12 +62382,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616), }); declarations.push(Declaration { - id: DeclarationId(2216), + id: DeclarationId(2218), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1062), + ty: DeclarationId(1064), }], }, type_params: vec![], @@ -62349,7 +62401,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661), }); declarations.push(Declaration { - id: DeclarationId(2217), + id: DeclarationId(2219), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62368,7 +62420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699), }); declarations.push(Declaration { - id: DeclarationId(2218), + id: DeclarationId(2220), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62378,7 +62430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "state".to_string(), - ty: DeclarationId(1063), + ty: DeclarationId(1065), }, ], }, @@ -62393,7 +62445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782), }); declarations.push(Declaration { - id: DeclarationId(2219), + id: DeclarationId(2221), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62412,7 +62464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011), }); declarations.push(Declaration { - id: DeclarationId(2220), + id: DeclarationId(2222), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62441,21 +62493,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107), }); declarations.push(Declaration { - id: DeclarationId(2221), + id: DeclarationId(2223), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "input_sample".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "expected_output".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62470,17 +62522,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244), }); declarations.push(Declaration { - id: DeclarationId(2222), + id: DeclarationId(2224), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "invariant".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62495,7 +62547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548), }); declarations.push(Declaration { - id: DeclarationId(2223), + id: DeclarationId(2225), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62515,7 +62567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360), }); declarations.push(Declaration { - id: DeclarationId(2224), + id: DeclarationId(2226), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62525,7 +62577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2223), + ty: DeclarationId(2225), }, Field { label: "expect_exit_code".to_string(), @@ -62544,7 +62596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394), }); declarations.push(Declaration { - id: DeclarationId(2225), + id: DeclarationId(2227), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62564,7 +62616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106), }); declarations.push(Declaration { - id: DeclarationId(2226), + id: DeclarationId(2228), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62574,7 +62626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2225), + ty: DeclarationId(2227), }, Field { label: "expect_exit_code".to_string(), @@ -62593,21 +62645,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140), }); declarations.push(Declaration { - id: DeclarationId(2227), + id: DeclarationId(2229), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "lens_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "expected_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62622,21 +62674,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560), }); declarations.push(Declaration { - id: DeclarationId(2228), + id: DeclarationId(2230), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "oracle_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62651,17 +62703,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947), }); declarations.push(Declaration { - id: DeclarationId(2229), + id: DeclarationId(2231), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "left_report_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "right_report_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62676,17 +62728,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8514, 8626), }); declarations.push(Declaration { - id: DeclarationId(2230), + id: DeclarationId(2232), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "law".to_string(), - ty: DeclarationId(1064), + ty: DeclarationId(1066), }, Field { label: "lens_ref".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62701,17 +62753,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9222, 9301), }); declarations.push(Declaration { - id: DeclarationId(2231), + id: DeclarationId(2233), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1053), + ty: DeclarationId(1055), }, Field { label: "bound".to_string(), @@ -62730,21 +62782,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9521, 9634), }); declarations.push(Declaration { - id: DeclarationId(2232), + id: DeclarationId(2234), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1053), + ty: DeclarationId(1055), }, Field { label: "subset_predicate".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62759,17 +62811,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9639, 9775), }); declarations.push(Declaration { - id: DeclarationId(2233), + id: DeclarationId(2235), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "compile_target".to_string(), - ty: DeclarationId(1051), + ty: DeclarationId(1053), }, Field { label: "expected".to_string(), - ty: DeclarationId(1052), + ty: DeclarationId(1054), }, ], }, @@ -62784,17 +62836,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9780, 9862), }); declarations.push(Declaration { - id: DeclarationId(2234), + id: DeclarationId(2236), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "ratchet_kind".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62809,13 +62861,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9867, 9953), }); declarations.push(Declaration { - id: DeclarationId(2235), + id: DeclarationId(2237), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1051), + value: DeclarationId(1053), }], }, type_params: vec![], @@ -62829,17 +62881,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10032, 10042), }); declarations.push(Declaration { - id: DeclarationId(2236), + id: DeclarationId(2238), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "generated_paths".to_string(), - ty: DeclarationId(2235), + ty: DeclarationId(2237), }, ], }, @@ -62854,21 +62906,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9958, 10048), }); declarations.push(Declaration { - id: DeclarationId(2237), + id: DeclarationId(2239), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62883,21 +62935,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10990, 11124), }); declarations.push(Declaration { - id: DeclarationId(2238), + id: DeclarationId(2240), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1081), + ty: DeclarationId(1083), }, ], }, @@ -62912,7 +62964,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 11763, 11907), }); declarations.push(Declaration { - id: DeclarationId(2239), + id: DeclarationId(2241), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62931,7 +62983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12752, 12806), }); declarations.push(Declaration { - id: DeclarationId(2240), + id: DeclarationId(2242), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62951,13 +63003,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13850, 13873), }); declarations.push(Declaration { - id: DeclarationId(2241), + id: DeclarationId(2243), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1068), + value: DeclarationId(1070), }], }, type_params: vec![], @@ -62971,7 +63023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934), }); declarations.push(Declaration { - id: DeclarationId(2242), + id: DeclarationId(2244), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62991,7 +63043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14190, 14213), }); declarations.push(Declaration { - id: DeclarationId(2243), + id: DeclarationId(2245), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63011,7 +63063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006), }); declarations.push(Declaration { - id: DeclarationId(2244), + id: DeclarationId(2246), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63025,7 +63077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547), }); declarations.push(Declaration { - id: DeclarationId(2245), + id: DeclarationId(2247), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63039,7 +63091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561), }); declarations.push(Declaration { - id: DeclarationId(2246), + id: DeclarationId(2248), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63053,7 +63105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576), }); declarations.push(Declaration { - id: DeclarationId(2247), + id: DeclarationId(2249), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(722), @@ -63070,7 +63122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(2248), + id: DeclarationId(2250), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63084,7 +63136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570), }); declarations.push(Declaration { - id: DeclarationId(2249), + id: DeclarationId(2251), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63098,7 +63150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590), }); declarations.push(Declaration { - id: DeclarationId(2250), + id: DeclarationId(2252), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63112,7 +63164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640), }); declarations.push(Declaration { - id: DeclarationId(2251), + id: DeclarationId(2253), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63126,7 +63178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660), }); declarations.push(Declaration { - id: DeclarationId(2252), + id: DeclarationId(2254), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63140,7 +63192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267), }); declarations.push(Declaration { - id: DeclarationId(2253), + id: DeclarationId(2255), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63154,7 +63206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283), }); declarations.push(Declaration { - id: DeclarationId(2254), + id: DeclarationId(2256), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63168,7 +63220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301), }); declarations.push(Declaration { - id: DeclarationId(2255), + id: DeclarationId(2257), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63182,7 +63234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319), }); declarations.push(Declaration { - id: DeclarationId(2256), + id: DeclarationId(2258), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63196,7 +63248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337), }); declarations.push(Declaration { - id: DeclarationId(2257), + id: DeclarationId(2259), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63210,7 +63262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356), }); declarations.push(Declaration { - id: DeclarationId(2258), + id: DeclarationId(2260), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63224,7 +63276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376), }); declarations.push(Declaration { - id: DeclarationId(2259), + id: DeclarationId(2261), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63238,7 +63290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135), }); declarations.push(Declaration { - id: DeclarationId(2260), + id: DeclarationId(2262), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63252,7 +63304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150), }); declarations.push(Declaration { - id: DeclarationId(2261), + id: DeclarationId(2263), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63266,7 +63318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159), }); declarations.push(Declaration { - id: DeclarationId(2262), + id: DeclarationId(2264), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63276,11 +63328,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1463), + ty: DeclarationId(1465), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1465), + ty: DeclarationId(1467), }, Field { label: "range_min_inclusive".to_string(), @@ -63296,7 +63348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "overflow".to_string(), - ty: DeclarationId(1466), + ty: DeclarationId(1468), }, ], }, @@ -63311,7 +63363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509), }); declarations.push(Declaration { - id: DeclarationId(2263), + id: DeclarationId(2265), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63321,11 +63373,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1464), + ty: DeclarationId(1466), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1465), + ty: DeclarationId(1467), }, Field { label: "is_copy".to_string(), @@ -63344,13 +63396,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696), }); declarations.push(Declaration { - id: DeclarationId(2264), + id: DeclarationId(2266), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1467), + value: DeclarationId(1469), }], }, type_params: vec![], @@ -63478,7 +63530,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(13), Port { id: PortId(13), - state: PortState::Resolved(TypeShape::new(DeclarationId(1689))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1691))), produced_by: Some(NodeId(9)), }, ); @@ -63502,7 +63554,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(16), Port { id: PortId(16), - state: PortState::Resolved(TypeShape::new(DeclarationId(1690))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1692))), produced_by: None, }, ); @@ -63510,7 +63562,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(17), Port { id: PortId(17), - state: PortState::Resolved(TypeShape::new(DeclarationId(1691))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1693))), produced_by: Some(NodeId(11)), }, ); @@ -63798,7 +63850,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(53), Port { id: PortId(53), - state: PortState::Resolved(TypeShape::new(DeclarationId(1692))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), produced_by: None, }, ); @@ -64662,7 +64714,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(161), Port { id: PortId(161), - state: PortState::Resolved(TypeShape::new(DeclarationId(1693))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), produced_by: None, }, ); @@ -64686,7 +64738,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(164), Port { id: PortId(164), - state: PortState::Resolved(TypeShape::new(DeclarationId(1690))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1692))), produced_by: Some(NodeId(113)), }, ); @@ -64702,7 +64754,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(166), Port { id: PortId(166), - state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), produced_by: Some(NodeId(115)), }, ); @@ -64710,7 +64762,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(167), Port { id: PortId(167), - state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1697))), produced_by: None, }, ); @@ -64814,7 +64866,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(180), Port { id: PortId(180), - state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1698))), produced_by: Some(NodeId(128)), }, ); @@ -64958,7 +65010,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(198), Port { id: PortId(198), - state: PortState::Resolved(TypeShape::new(DeclarationId(1697))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1699))), produced_by: None, }, ); @@ -65070,7 +65122,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(212), Port { id: PortId(212), - state: PortState::Resolved(TypeShape::new(DeclarationId(1698))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1700))), produced_by: None, }, ); @@ -65182,7 +65234,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(226), Port { id: PortId(226), - state: PortState::Resolved(TypeShape::new(DeclarationId(1699))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1701))), produced_by: None, }, ); @@ -65798,7 +65850,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(303), Port { id: PortId(303), - state: PortState::Resolved(TypeShape::new(DeclarationId(1700))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1702))), produced_by: None, }, ); @@ -65910,7 +65962,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(317), Port { id: PortId(317), - state: PortState::Resolved(TypeShape::new(DeclarationId(1701))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1703))), produced_by: Some(NodeId(227)), }, ); @@ -65918,7 +65970,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(318), Port { id: PortId(318), - state: PortState::Resolved(TypeShape::new(DeclarationId(1702))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1704))), produced_by: None, }, ); @@ -65974,7 +66026,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(325), Port { id: PortId(325), - state: PortState::Resolved(TypeShape::new(DeclarationId(1703))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1705))), produced_by: Some(NodeId(234)), }, ); @@ -65982,7 +66034,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(326), Port { id: PortId(326), - state: PortState::Resolved(TypeShape::new(DeclarationId(1704))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1706))), produced_by: None, }, ); @@ -65998,7 +66050,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(328), Port { id: PortId(328), - state: PortState::Resolved(TypeShape::new(DeclarationId(1705))), + state: PortState::Resolved(TypeShape::new(DeclarationId(1707))), produced_by: Some(NodeId(237)), }, ); @@ -66014,7 +66066,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(330), Port { id: PortId(330), - state: PortState::Resolved(TypeShape::new(DeclarationId(2243))), + state: PortState::Resolved(TypeShape::new(DeclarationId(2245))), produced_by: Some(NodeId(239)), }, ); diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs index daaa788b392..c909235d68a 100644 --- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs +++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs @@ -8,7 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { ports: bootstrapped_fixture_without_parse_surface_dag_ports(), diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(), next_node_id: 275, - next_declaration_id: 2182, + next_declaration_id: 2184, next_port_id: 371, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -23,7 +23,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { callable_strategy_variants: CallableStrategyVariants::default(), clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(), optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 2182, + declaration_append_begin_after_bootstrap: 2184, } } @@ -118,21 +118,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(7), - target: TransformTarget::Callable(DeclarationId(1712)), + target: TransformTarget::Callable(DeclarationId(1714)), inputs: vec![PortId(9)], output: PortId(11), span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(8), - target: TransformTarget::Callable(DeclarationId(1714)), + target: TransformTarget::Callable(DeclarationId(1716)), inputs: vec![PortId(11)], output: PortId(12), span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(9), - target: TransformTarget::Callable(DeclarationId(1674)), + target: TransformTarget::Callable(DeclarationId(1676)), inputs: vec![PortId(9), PortId(10), PortId(12)], output: PortId(13), span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446), @@ -148,7 +148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(11), - target: TransformTarget::Callable(DeclarationId(1676)), + target: TransformTarget::Callable(DeclarationId(1678)), inputs: vec![PortId(14), PortId(15), PortId(16)], output: PortId(17), span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633), @@ -164,7 +164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(13), - target: TransformTarget::Callable(DeclarationId(1715)), + target: TransformTarget::Callable(DeclarationId(1717)), inputs: vec![PortId(18)], output: PortId(19), span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), @@ -317,7 +317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(27), - target: TransformTarget::Callable(DeclarationId(1709)), + target: TransformTarget::Callable(DeclarationId(1711)), inputs: vec![PortId(35)], output: PortId(36), span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256), @@ -347,7 +347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(31), - target: TransformTarget::Callable(DeclarationId(1707)), + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(40)], output: PortId(41), span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560), @@ -477,14 +477,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(43), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(54)], output: PortId(55), span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(44), - target: TransformTarget::Callable(DeclarationId(1717)), + target: TransformTarget::Callable(DeclarationId(1719)), inputs: vec![PortId(53), PortId(55)], output: PortId(56), span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), @@ -1194,7 +1194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(91), - target: TransformTarget::Callable(DeclarationId(1719)), + target: TransformTarget::Callable(DeclarationId(1721)), inputs: vec![PortId(136), PortId(137)], output: PortId(138), span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), @@ -1222,7 +1222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(95), - target: TransformTarget::Callable(DeclarationId(1721)), + target: TransformTarget::Callable(DeclarationId(1723)), inputs: vec![PortId(141), PortId(142)], output: PortId(143), span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), @@ -1525,7 +1525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(113), target: TransformTarget::FieldProject { field_label: "rest".to_string(), - field_child: Some(DeclarationId(1488)), + field_child: Some(DeclarationId(1490)), }, inputs: vec![PortId(161)], output: PortId(164), @@ -1533,14 +1533,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(114), - target: TransformTarget::Callable(DeclarationId(1722)), + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(163), PortId(164)], output: PortId(165), span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(115), - target: TransformTarget::Callable(DeclarationId(1723)), + target: TransformTarget::Callable(DeclarationId(1725)), inputs: vec![PortId(162), PortId(165)], output: PortId(166), span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), @@ -1556,7 +1556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(117), - target: TransformTarget::Callable(DeclarationId(1724)), + target: TransformTarget::Callable(DeclarationId(1726)), inputs: vec![], output: PortId(168), span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), @@ -1624,7 +1624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(125), - target: TransformTarget::Callable(DeclarationId(1725)), + target: TransformTarget::Callable(DeclarationId(1727)), inputs: vec![PortId(174), PortId(176)], output: PortId(177), span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), @@ -1871,7 +1871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(141), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(199)], output: PortId(200), span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983), @@ -1918,7 +1918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(146), - target: TransformTarget::Callable(DeclarationId(1726)), + target: TransformTarget::Callable(DeclarationId(1728)), inputs: vec![PortId(205), PortId(206)], output: PortId(207), span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), @@ -2015,7 +2015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(153), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(213)], output: PortId(214), span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254), @@ -2079,7 +2079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(160), - target: TransformTarget::Callable(DeclarationId(1709)), + target: TransformTarget::Callable(DeclarationId(1711)), inputs: vec![PortId(222)], output: PortId(223), span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416), @@ -2162,7 +2162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(165), - target: TransformTarget::Callable(DeclarationId(1703)), + target: TransformTarget::Callable(DeclarationId(1705)), inputs: vec![PortId(227)], output: PortId(228), span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720), @@ -2263,7 +2263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(176), - target: TransformTarget::Callable(DeclarationId(1707)), + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(241)], output: PortId(242), span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010), @@ -2735,7 +2735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), - target: TransformTarget::Callable(DeclarationId(1707)), + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(291)], output: PortId(292), span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421), @@ -2830,7 +2830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(216), - target: TransformTarget::Callable(DeclarationId(1727)), + target: TransformTarget::Callable(DeclarationId(1729)), inputs: vec![], output: PortId(305), span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), @@ -2898,7 +2898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(224), - target: TransformTarget::Callable(DeclarationId(1728)), + target: TransformTarget::Callable(DeclarationId(1730)), inputs: vec![PortId(311), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), @@ -2987,7 +2987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(230), - target: TransformTarget::Callable(DeclarationId(1730)), + target: TransformTarget::Callable(DeclarationId(1732)), inputs: vec![PortId(318), PortId(320)], output: PortId(321), span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), @@ -3008,7 +3008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(233), - target: TransformTarget::Callable(DeclarationId(1731)), + target: TransformTarget::Callable(DeclarationId(1733)), inputs: vec![PortId(319), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), @@ -3051,14 +3051,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(236), - target: TransformTarget::Callable(DeclarationId(1732)), + target: TransformTarget::Callable(DeclarationId(1734)), inputs: vec![], output: PortId(327), span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(237), - target: TransformTarget::Callable(DeclarationId(1734)), + target: TransformTarget::Callable(DeclarationId(1736)), inputs: vec![PortId(326), PortId(327)], output: PortId(328), span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), @@ -3076,7 +3076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(239), target: TransformTarget::FieldProject { field_label: "nodes".to_string(), - field_child: Some(DeclarationId(1665)), + field_child: Some(DeclarationId(1667)), }, inputs: vec![PortId(329)], output: PortId(330), @@ -3644,7 +3644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec { { - let mut declarations = Vec::with_capacity(2182); + let mut declarations = Vec::with_capacity(2184); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -16092,11 +16092,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1935), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1934), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); declarations.push(Declaration { id: DeclarationId(1009), + name: Some("EvalMemoKey".to_string()), + connective: TypeConnective::Conj { + children: vec![ + Field { + label: "program".to_string(), + ty: DeclarationId(642), + }, + Field { + label: "node".to_string(), + ty: DeclarationId(640), + }, + Field { + label: "state_key".to_string(), + ty: DeclarationId(1006), + }, + Field { + label: "strategy".to_string(), + ty: DeclarationId(1007), + }, + ], + }, + type_params: vec![], + phantom_params: Vec::new(), + meta_tag: None, + specialization_parent: None, + inhabits: None, + value_body: None, + refinement: None, + nominal_opacity: None, + span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153), + }); + declarations.push(Declaration { id: DeclarationId(1010), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(931) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1999)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1938), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1937), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1936), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); + declarations.push(Declaration { + id: DeclarationId(1011), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -27024,7 +27076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); + declarations.push(Declaration { id: DeclarationId(1395), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(923)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); declarations.push(Declaration { - id: DeclarationId(1394), + id: DeclarationId(1396), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -44162,7 +44214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap HashMap Date: Sat, 2 May 2026 23:42:17 -0400 Subject: [PATCH 7/7] WIP: nimble-tern-266 --- src/v3/compiler/src/bootstrap_generated.rs | 19311 +++------------- ...otstrap_generated_without_parse_surface.rs | 17841 +++----------- 2 files changed, 5498 insertions(+), 31654 deletions(-) diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index df2a7cadc0f..9d6ddaf22b3 100644 --- a/src/v3/compiler/src/bootstrap_generated.rs +++ b/src/v3/compiler/src/bootstrap_generated.rs @@ -8,11 +8,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { ports: bootstrapped_fixture_dag_ports(), diagnostics: bootstrapped_fixture_dag_diagnostics(), next_node_id: 275, -<<<<<<< HEAD - next_declaration_id: 2275, -======= - next_declaration_id: 2274, ->>>>>>> origin/main + next_declaration_id: 2276, next_port_id: 371, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -27,11 +23,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { callable_strategy_variants: CallableStrategyVariants::default(), clusters: bootstrapped_fixture_dag_clusters(), optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(), -<<<<<<< HEAD - declaration_append_begin_after_bootstrap: 2275, -======= - declaration_append_begin_after_bootstrap: 2274, ->>>>>>> origin/main + declaration_append_begin_after_bootstrap: 2276, } } @@ -126,33 +118,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(7), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1732)), -======= - target: TransformTarget::Callable(DeclarationId(1731)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1733)), inputs: vec![PortId(9)], output: PortId(11), span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(8), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1734)), -======= - target: TransformTarget::Callable(DeclarationId(1733)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1735)), inputs: vec![PortId(11)], output: PortId(12), span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(9), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1694)), -======= - target: TransformTarget::Callable(DeclarationId(1693)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1695)), inputs: vec![PortId(9), PortId(10), PortId(12)], output: PortId(13), span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446), @@ -168,11 +148,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(11), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1696)), -======= - target: TransformTarget::Callable(DeclarationId(1695)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1697)), inputs: vec![PortId(14), PortId(15), PortId(16)], output: PortId(17), span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633), @@ -188,11 +164,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(13), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1735)), -======= - target: TransformTarget::Callable(DeclarationId(1734)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1736)), inputs: vec![PortId(18)], output: PortId(19), span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), @@ -345,11 +317,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(27), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1729)), -======= - target: TransformTarget::Callable(DeclarationId(1728)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1730)), inputs: vec![PortId(35)], output: PortId(36), span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256), @@ -379,11 +347,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(31), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1727)), -======= - target: TransformTarget::Callable(DeclarationId(1726)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1728)), inputs: vec![PortId(40)], output: PortId(41), span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560), @@ -513,22 +477,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(43), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1723)), -======= - target: TransformTarget::Callable(DeclarationId(1722)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(54)], output: PortId(55), span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(44), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1737)), -======= - target: TransformTarget::Callable(DeclarationId(1736)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1738)), inputs: vec![PortId(53), PortId(55)], output: PortId(56), span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), @@ -1238,11 +1194,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(91), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1739)), -======= - target: TransformTarget::Callable(DeclarationId(1738)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1740)), inputs: vec![PortId(136), PortId(137)], output: PortId(138), span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), @@ -1270,11 +1222,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(95), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1741)), -======= - target: TransformTarget::Callable(DeclarationId(1740)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1742)), inputs: vec![PortId(141), PortId(142)], output: PortId(143), span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), @@ -1577,11 +1525,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(113), target: TransformTarget::FieldProject { field_label: "rest".to_string(), -<<<<<<< HEAD - field_child: Some(DeclarationId(1508)), -======= - field_child: Some(DeclarationId(1507)), ->>>>>>> origin/main + field_child: Some(DeclarationId(1509)), }, inputs: vec![PortId(161)], output: PortId(164), @@ -1589,22 +1533,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(114), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1742)), -======= - target: TransformTarget::Callable(DeclarationId(1741)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1743)), inputs: vec![PortId(163), PortId(164)], output: PortId(165), span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(115), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1743)), -======= - target: TransformTarget::Callable(DeclarationId(1742)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1744)), inputs: vec![PortId(162), PortId(165)], output: PortId(166), span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), @@ -1620,11 +1556,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(117), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1744)), -======= - target: TransformTarget::Callable(DeclarationId(1743)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1745)), inputs: vec![], output: PortId(168), span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), @@ -1692,11 +1624,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(125), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1745)), -======= - target: TransformTarget::Callable(DeclarationId(1744)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1746)), inputs: vec![PortId(174), PortId(176)], output: PortId(177), span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), @@ -1943,11 +1871,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(141), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1723)), -======= - target: TransformTarget::Callable(DeclarationId(1722)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(199)], output: PortId(200), span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983), @@ -1994,11 +1918,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(146), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1746)), -======= - target: TransformTarget::Callable(DeclarationId(1745)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1747)), inputs: vec![PortId(205), PortId(206)], output: PortId(207), span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), @@ -2095,11 +2015,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(153), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1723)), -======= - target: TransformTarget::Callable(DeclarationId(1722)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(213)], output: PortId(214), span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254), @@ -2163,11 +2079,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(160), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1729)), -======= - target: TransformTarget::Callable(DeclarationId(1728)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1730)), inputs: vec![PortId(222)], output: PortId(223), span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416), @@ -2250,11 +2162,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(165), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1723)), -======= - target: TransformTarget::Callable(DeclarationId(1722)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1724)), inputs: vec![PortId(227)], output: PortId(228), span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720), @@ -2355,11 +2263,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(176), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1727)), -======= - target: TransformTarget::Callable(DeclarationId(1726)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1728)), inputs: vec![PortId(241)], output: PortId(242), span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010), @@ -2831,11 +2735,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1727)), -======= - target: TransformTarget::Callable(DeclarationId(1726)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1728)), inputs: vec![PortId(291)], output: PortId(292), span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421), @@ -2930,11 +2830,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(216), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1747)), -======= - target: TransformTarget::Callable(DeclarationId(1746)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1748)), inputs: vec![], output: PortId(305), span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), @@ -3002,11 +2898,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(224), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1748)), -======= - target: TransformTarget::Callable(DeclarationId(1747)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1749)), inputs: vec![PortId(311), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), @@ -3095,11 +2987,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(230), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1750)), -======= - target: TransformTarget::Callable(DeclarationId(1749)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1751)), inputs: vec![PortId(318), PortId(320)], output: PortId(321), span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), @@ -3120,11 +3008,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(233), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1751)), -======= - target: TransformTarget::Callable(DeclarationId(1750)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1752)), inputs: vec![PortId(319), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), @@ -3167,22 +3051,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(236), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1752)), -======= - target: TransformTarget::Callable(DeclarationId(1751)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1753)), inputs: vec![], output: PortId(327), span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(237), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1754)), -======= - target: TransformTarget::Callable(DeclarationId(1753)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1755)), inputs: vec![PortId(326), PortId(327)], output: PortId(328), span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), @@ -3200,11 +3076,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(239), target: TransformTarget::FieldProject { field_label: "nodes".to_string(), -<<<<<<< HEAD - field_child: Some(DeclarationId(1685)), -======= - field_child: Some(DeclarationId(1684)), ->>>>>>> origin/main + field_child: Some(DeclarationId(1686)), }, inputs: vec![PortId(329)], output: PortId(330), @@ -3772,11 +3644,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_dag_declarations() -> Vec { { -<<<<<<< HEAD - let mut declarations = Vec::with_capacity(2275); -======= - let mut declarations = Vec::with_capacity(2274); ->>>>>>> origin/main + let mut declarations = Vec::with_capacity(2276); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -16224,19 +16092,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Empty".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1504), - }, - Field { - label: "Cons".to_string(), - ty: DeclarationId(1506), -======= - ty: DeclarationId(1503), + ty: DeclarationId(1505), }, Field { label: "Cons".to_string(), - ty: DeclarationId(1505), ->>>>>>> origin/main + ty: DeclarationId(1507), }, ], }, @@ -16269,11 +16129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("empty".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(1474), -======= - output: DeclarationId(1473), ->>>>>>> origin/main + output: DeclarationId(1475), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), }, type_params: vec![DeclarationId(607)], @@ -16304,13 +16160,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(608), name: Some("cons".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(609), DeclarationId(1475)], - output: DeclarationId(1476), -======= - inputs: vec![DeclarationId(609), DeclarationId(1474)], - output: DeclarationId(1475), ->>>>>>> origin/main + inputs: vec![DeclarationId(609), DeclarationId(1476)], + output: DeclarationId(1477), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), }, type_params: vec![DeclarationId(609)], @@ -16342,11 +16193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("singleton".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(611)], -<<<<<<< HEAD - output: DeclarationId(1477), -======= - output: DeclarationId(1476), ->>>>>>> origin/main + output: DeclarationId(1478), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, type_params: vec![DeclarationId(611)], @@ -16377,11 +16224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(612), name: Some("fold".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1478), DeclarationId(614), DeclarationId(1479)], -======= - inputs: vec![DeclarationId(1477), DeclarationId(614), DeclarationId(1478)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1479), DeclarationId(614), DeclarationId(1480)], output: DeclarationId(614), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, @@ -16427,11 +16270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(615), name: Some("fold_right".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1480), DeclarationId(617), DeclarationId(1481)], -======= - inputs: vec![DeclarationId(1479), DeclarationId(617), DeclarationId(1480)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1481), DeclarationId(617), DeclarationId(1482)], output: DeclarationId(617), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, @@ -16477,13 +16316,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(618), name: Some("concat".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1482), DeclarationId(1483)], - output: DeclarationId(1484), -======= - inputs: vec![DeclarationId(1481), DeclarationId(1482)], - output: DeclarationId(1483), ->>>>>>> origin/main + inputs: vec![DeclarationId(1483), DeclarationId(1484)], + output: DeclarationId(1485), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)), }, type_params: vec![DeclarationId(619)], @@ -16514,13 +16348,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(620), name: Some("map".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1485), DeclarationId(1486)], - output: DeclarationId(1487), -======= - inputs: vec![DeclarationId(1484), DeclarationId(1485)], - output: DeclarationId(1486), ->>>>>>> origin/main + inputs: vec![DeclarationId(1486), DeclarationId(1487)], + output: DeclarationId(1488), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)), }, type_params: vec![DeclarationId(621), DeclarationId(622)], @@ -16565,13 +16394,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(623), name: Some("filter".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1488), DeclarationId(1489)], - output: DeclarationId(1490), -======= - inputs: vec![DeclarationId(1487), DeclarationId(1488)], - output: DeclarationId(1489), ->>>>>>> origin/main + inputs: vec![DeclarationId(1489), DeclarationId(1490)], + output: DeclarationId(1491), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)), }, type_params: vec![DeclarationId(624)], @@ -16602,13 +16426,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(625), name: Some("flat_map".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1491), DeclarationId(1493)], - output: DeclarationId(1494), -======= - inputs: vec![DeclarationId(1490), DeclarationId(1492)], - output: DeclarationId(1493), ->>>>>>> origin/main + inputs: vec![DeclarationId(1492), DeclarationId(1494)], + output: DeclarationId(1495), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)), }, type_params: vec![DeclarationId(626), DeclarationId(627)], @@ -16653,11 +16472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(628), name: Some("length".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1495)], -======= - inputs: vec![DeclarationId(1494)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1496)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)), }, @@ -16689,11 +16504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(630), name: Some("is_empty".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1496)], -======= - inputs: vec![DeclarationId(1495)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1497)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)), }, @@ -16764,13 +16575,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(634), name: Some("enumerate".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1497)], - output: DeclarationId(1499), -======= - inputs: vec![DeclarationId(1496)], - output: DeclarationId(1498), ->>>>>>> origin/main + inputs: vec![DeclarationId(1498)], + output: DeclarationId(1500), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)), }, type_params: vec![DeclarationId(635)], @@ -16801,13 +16607,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(636), name: Some("enumerate_helper".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1500), DeclarationId(81)], - output: DeclarationId(1502), -======= - inputs: vec![DeclarationId(1499), DeclarationId(81)], - output: DeclarationId(1501), ->>>>>>> origin/main + inputs: vec![DeclarationId(1501), DeclarationId(81)], + output: DeclarationId(1503), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), }, type_params: vec![DeclarationId(637)], @@ -16838,11 +16639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(638), name: Some("contains".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1503), DeclarationId(639)], -======= - inputs: vec![DeclarationId(1502), DeclarationId(639)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1504), DeclarationId(639)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -16937,11 +16734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1507), -======= - ty: DeclarationId(1506), ->>>>>>> origin/main + ty: DeclarationId(1508), }, ], }, @@ -16984,11 +16777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "rest".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1508), -======= - ty: DeclarationId(1507), ->>>>>>> origin/main + ty: DeclarationId(1509), }, ], }, @@ -17023,19 +16812,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralToken".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1523), - }, - Field { - label: "ParamToken".to_string(), ty: DeclarationId(1524), -======= - ty: DeclarationId(1522), }, Field { label: "ParamToken".to_string(), - ty: DeclarationId(1523), ->>>>>>> origin/main + ty: DeclarationId(1525), }, ], }, @@ -17055,11 +16836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1525), -======= - ty: DeclarationId(1524), ->>>>>>> origin/main + ty: DeclarationId(1526), }], }, type_params: vec![], @@ -17079,19 +16856,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedSegmentTokens".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1527), - }, - Field { - label: "MalformedPathSegment".to_string(), ty: DeclarationId(1528), -======= - ty: DeclarationId(1526), }, Field { label: "MalformedPathSegment".to_string(), - ty: DeclarationId(1527), ->>>>>>> origin/main + ty: DeclarationId(1529), }, ], }, @@ -17112,19 +16881,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParsedPathTemplate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1529), - }, - Field { - label: "MalformedPathTemplate".to_string(), ty: DeclarationId(1530), -======= - ty: DeclarationId(1528), }, Field { label: "MalformedPathTemplate".to_string(), - ty: DeclarationId(1529), ->>>>>>> origin/main + ty: DeclarationId(1531), }, ], }, @@ -17179,11 +16940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("last_path_param".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(649)], -<<<<<<< HEAD - output: DeclarationId(1509), -======= - output: DeclarationId(1508), ->>>>>>> origin/main + output: DeclarationId(1510), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, type_params: vec![], @@ -17203,27 +16960,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ReadEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1531), - }, - Field { - label: "UpsertEffect".to_string(), ty: DeclarationId(1532), }, - Field { - label: "DeleteEffect".to_string(), - ty: DeclarationId(1533), -======= - ty: DeclarationId(1530), - }, Field { label: "UpsertEffect".to_string(), - ty: DeclarationId(1531), ->>>>>>> origin/main + ty: DeclarationId(1533), }, Field { label: "DeleteEffect".to_string(), - ty: DeclarationId(1532), + ty: DeclarationId(1534), }, ], }, @@ -17244,19 +16989,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CreateEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1534), - }, - Field { - label: "AppendEffect".to_string(), ty: DeclarationId(1535), -======= - ty: DeclarationId(1533), }, Field { label: "AppendEffect".to_string(), - ty: DeclarationId(1534), ->>>>>>> origin/main + ty: DeclarationId(1536), }, ], }, @@ -17277,19 +17014,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IsIdempotent".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1536), - }, - Field { - label: "IsBreaking".to_string(), ty: DeclarationId(1537), -======= - ty: DeclarationId(1535), }, Field { label: "IsBreaking".to_string(), - ty: DeclarationId(1536), ->>>>>>> origin/main + ty: DeclarationId(1538), }, ], }, @@ -17310,19 +17039,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PostAlways".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1538), - }, - Field { - label: "KeylessFallback".to_string(), ty: DeclarationId(1539), -======= - ty: DeclarationId(1537), }, Field { label: "KeylessFallback".to_string(), - ty: DeclarationId(1538), ->>>>>>> origin/main + ty: DeclarationId(1540), }, ], }, @@ -17343,27 +17064,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PathParam".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1540), - }, - Field { - label: "InputField".to_string(), ty: DeclarationId(1541), -======= - ty: DeclarationId(1539), ->>>>>>> origin/main }, Field { label: "InputField".to_string(), - ty: DeclarationId(1540), + ty: DeclarationId(1542), }, Field { label: "CompositeKey".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1543), -======= - ty: DeclarationId(1542), ->>>>>>> origin/main + ty: DeclarationId(1544), }, ], }, @@ -17384,27 +17093,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LatticeEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1544), - }, - Field { - label: "IdentityEffect".to_string(), ty: DeclarationId(1545), }, - Field { - label: "NonIdempotent".to_string(), - ty: DeclarationId(1546), -======= - ty: DeclarationId(1543), - }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1544), ->>>>>>> origin/main + ty: DeclarationId(1546), }, Field { label: "NonIdempotent".to_string(), - ty: DeclarationId(1545), + ty: DeclarationId(1547), }, ], }, @@ -17486,27 +17183,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DerivedEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1547), - }, - Field { - label: "UnknownHttpMethodInput".to_string(), ty: DeclarationId(1548), }, - Field { - label: "MalformedPathInput".to_string(), - ty: DeclarationId(1549), -======= - ty: DeclarationId(1546), - }, Field { label: "UnknownHttpMethodInput".to_string(), - ty: DeclarationId(1547), ->>>>>>> origin/main + ty: DeclarationId(1549), }, Field { label: "MalformedPathInput".to_string(), - ty: DeclarationId(1548), + ty: DeclarationId(1550), }, ], }, @@ -17527,19 +17212,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IdempotentComposition".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1550), - }, - Field { - label: "BrokenBy".to_string(), - ty: DeclarationId(1552), -======= - ty: DeclarationId(1549), + ty: DeclarationId(1551), }, Field { label: "BrokenBy".to_string(), - ty: DeclarationId(1551), ->>>>>>> origin/main + ty: DeclarationId(1553), }, ], }, @@ -17576,11 +17253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("breaker_ref".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], -<<<<<<< HEAD - output: DeclarationId(1510), -======= - output: DeclarationId(1509), ->>>>>>> origin/main + output: DeclarationId(1511), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)), }, type_params: vec![], @@ -17597,13 +17270,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(668), name: Some("indexed_breaker_ref".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1511)], - output: DeclarationId(1513), -======= - inputs: vec![DeclarationId(1510)], - output: DeclarationId(1512), ->>>>>>> origin/main + inputs: vec![DeclarationId(1512)], + output: DeclarationId(1514), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)), }, type_params: vec![], @@ -17620,13 +17288,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(669), name: Some("first_breaker_ref".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1514)], - output: DeclarationId(1516), -======= - inputs: vec![DeclarationId(1513)], - output: DeclarationId(1515), ->>>>>>> origin/main + inputs: vec![DeclarationId(1515)], + output: DeclarationId(1517), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)), }, type_params: vec![], @@ -17643,11 +17306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(670), name: Some("compose_effects".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1517)], -======= - inputs: vec![DeclarationId(1516)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1518)], output: DeclarationId(665), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, @@ -17712,35 +17371,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LinearEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1554), + ty: DeclarationId(1555), }, Field { label: "BranchEffect".to_string(), - ty: DeclarationId(1556), - }, - Field { - label: "LoopEffect".to_string(), ty: DeclarationId(1557), -======= - ty: DeclarationId(1553), - }, - Field { - label: "BranchEffect".to_string(), - ty: DeclarationId(1555), ->>>>>>> origin/main }, Field { label: "LoopEffect".to_string(), - ty: DeclarationId(1556), + ty: DeclarationId(1558), }, Field { label: "ParallelEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1559), -======= - ty: DeclarationId(1558), ->>>>>>> origin/main + ty: DeclarationId(1560), }, ], }, @@ -17790,19 +17433,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WorkflowCompositionVerdict".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1560), - }, - Field { - label: "IdempotencyUnsupported".to_string(), ty: DeclarationId(1561), -======= - ty: DeclarationId(1559), }, Field { label: "IdempotencyUnsupported".to_string(), - ty: DeclarationId(1560), ->>>>>>> origin/main + ty: DeclarationId(1562), }, ], }, @@ -17841,43 +17476,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoWorkflowProjection".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1562), - }, - Field { - label: "NotParallelEffectRoot".to_string(), ty: DeclarationId(1563), }, - Field { - label: "NonLinearParallelBranch".to_string(), - ty: DeclarationId(1564), - }, - Field { - label: "PairwiseNonCommute".to_string(), - ty: DeclarationId(1565), - }, - Field { - label: "LensSurfacePending".to_string(), - ty: DeclarationId(1566), -======= - ty: DeclarationId(1561), - }, Field { label: "NotParallelEffectRoot".to_string(), - ty: DeclarationId(1562), + ty: DeclarationId(1564), }, Field { label: "NonLinearParallelBranch".to_string(), - ty: DeclarationId(1563), + ty: DeclarationId(1565), }, Field { label: "PairwiseNonCommute".to_string(), - ty: DeclarationId(1564), + ty: DeclarationId(1566), }, Field { label: "LensSurfacePending".to_string(), - ty: DeclarationId(1565), ->>>>>>> origin/main + ty: DeclarationId(1567), }, ], }, @@ -17927,19 +17542,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ParallelCompositionVerdict".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1567), - }, - Field { - label: "ParallelismUnsupported".to_string(), ty: DeclarationId(1568), -======= - ty: DeclarationId(1566), }, Field { label: "ParallelismUnsupported".to_string(), - ty: DeclarationId(1567), ->>>>>>> origin/main + ty: DeclarationId(1569), }, ], }, @@ -17994,11 +17601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("parse_http_method".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], -<<<<<<< HEAD - output: DeclarationId(1518), -======= - output: DeclarationId(1517), ->>>>>>> origin/main + output: DeclarationId(1519), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)), }, type_params: vec![], @@ -18033,11 +17636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(684), name: Some("upsert_or_create".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1519), DeclarationId(167)], -======= - inputs: vec![DeclarationId(1518), DeclarationId(167)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1520), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, @@ -18055,11 +17654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(685), name: Some("delete_or_create".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1520), DeclarationId(167)], -======= - inputs: vec![DeclarationId(1519), DeclarationId(167)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1521), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, @@ -18116,27 +17711,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Agrees".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1569), - }, - Field { - label: "Disagrees".to_string(), ty: DeclarationId(1570), }, - Field { - label: "DerivationUnknown".to_string(), - ty: DeclarationId(1571), -======= - ty: DeclarationId(1568), - }, Field { label: "Disagrees".to_string(), - ty: DeclarationId(1569), ->>>>>>> origin/main + ty: DeclarationId(1571), }, Field { label: "DerivationUnknown".to_string(), - ty: DeclarationId(1570), + ty: DeclarationId(1572), }, ], }, @@ -18157,19 +17740,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ModifierNotDeclared".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1572), - }, - Field { - label: "ModifierDeclared".to_string(), ty: DeclarationId(1573), -======= - ty: DeclarationId(1571), }, Field { label: "ModifierDeclared".to_string(), - ty: DeclarationId(1572), ->>>>>>> origin/main + ty: DeclarationId(1574), }, ], }, @@ -18307,13 +17882,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(695), name: Some("generate_idempotency_obligations".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1521)], - output: DeclarationId(1522), -======= - inputs: vec![DeclarationId(1520)], - output: DeclarationId(1521), ->>>>>>> origin/main + inputs: vec![DeclarationId(1522)], + output: DeclarationId(1523), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)), }, type_params: vec![], @@ -18381,27 +17951,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Uninferred".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1581), - }, - Field { - label: "Resolved".to_string(), ty: DeclarationId(1582), }, - Field { - label: "Unresolved".to_string(), - ty: DeclarationId(1583), -======= - ty: DeclarationId(1580), - }, Field { label: "Resolved".to_string(), - ty: DeclarationId(1581), ->>>>>>> origin/main + ty: DeclarationId(1583), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(1582), + ty: DeclarationId(1584), }, ], }, @@ -18430,11 +17988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "produced_by".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1584), -======= - ty: DeclarationId(1583), ->>>>>>> origin/main + ty: DeclarationId(1585), }, ], }, @@ -18455,27 +18009,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LitInt".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1585), - }, - Field { - label: "LitBool".to_string(), ty: DeclarationId(1586), }, - Field { - label: "LitString".to_string(), - ty: DeclarationId(1587), -======= - ty: DeclarationId(1584), - }, Field { label: "LitBool".to_string(), - ty: DeclarationId(1585), ->>>>>>> origin/main + ty: DeclarationId(1587), }, Field { label: "LitString".to_string(), - ty: DeclarationId(1586), + ty: DeclarationId(1588), }, ], }, @@ -18496,43 +18038,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1588), - }, - Field { - label: "UnresolvedIdentifier".to_string(), ty: DeclarationId(1589), }, - Field { - label: "ResolvedByStructure".to_string(), - ty: DeclarationId(1590), - }, - Field { - label: "ResolvedByName".to_string(), - ty: DeclarationId(1591), - }, - Field { - label: "TypeParam".to_string(), - ty: DeclarationId(1592), -======= - ty: DeclarationId(1587), - }, Field { label: "UnresolvedIdentifier".to_string(), - ty: DeclarationId(1588), + ty: DeclarationId(1590), }, Field { label: "ResolvedByStructure".to_string(), - ty: DeclarationId(1589), + ty: DeclarationId(1591), }, Field { label: "ResolvedByName".to_string(), - ty: DeclarationId(1590), + ty: DeclarationId(1592), }, Field { label: "TypeParam".to_string(), - ty: DeclarationId(1591), ->>>>>>> origin/main + ty: DeclarationId(1593), }, ], }, @@ -18553,27 +18075,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OneUnit".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1593), - }, - Field { - label: "AdditionalUnit".to_string(), ty: DeclarationId(1594), }, - Field { - label: "UnitCount".to_string(), - ty: DeclarationId(1595), -======= - ty: DeclarationId(1592), - }, Field { label: "AdditionalUnit".to_string(), - ty: DeclarationId(1593), ->>>>>>> origin/main + ty: DeclarationId(1595), }, Field { label: "UnitCount".to_string(), - ty: DeclarationId(1594), + ty: DeclarationId(1596), }, ], }, @@ -18594,19 +18104,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ZeroWidth".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1596), - }, - Field { - label: "PositiveWidth".to_string(), ty: DeclarationId(1597), -======= - ty: DeclarationId(1595), }, Field { label: "PositiveWidth".to_string(), - ty: DeclarationId(1596), ->>>>>>> origin/main + ty: DeclarationId(1598), }, ], }, @@ -18627,19 +18129,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundedInterval".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1598), - }, - Field { - label: "Unbounded".to_string(), ty: DeclarationId(1599), -======= - ty: DeclarationId(1597), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1598), ->>>>>>> origin/main + ty: DeclarationId(1600), }, ], }, @@ -18694,19 +18188,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StaticBound".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1601), - }, - Field { - label: "PlatformDependent".to_string(), ty: DeclarationId(1602), -======= - ty: DeclarationId(1600), }, Field { label: "PlatformDependent".to_string(), - ty: DeclarationId(1601), ->>>>>>> origin/main + ty: DeclarationId(1603), }, ], }, @@ -18727,27 +18213,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Exact".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1603), - }, - Field { - label: "AtMostOne".to_string(), ty: DeclarationId(1604), }, - Field { - label: "Unbounded".to_string(), - ty: DeclarationId(1605), -======= - ty: DeclarationId(1602), - }, Field { label: "AtMostOne".to_string(), - ty: DeclarationId(1603), ->>>>>>> origin/main + ty: DeclarationId(1605), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1604), + ty: DeclarationId(1606), }, ], }, @@ -18843,51 +18317,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1606), - }, - Field { - label: "Reference".to_string(), ty: DeclarationId(1607), }, - Field { - label: "Record".to_string(), - ty: DeclarationId(1609), - }, - Field { - label: "List".to_string(), - ty: DeclarationId(1611), - }, - Field { - label: "Map".to_string(), - ty: DeclarationId(1613), -======= - ty: DeclarationId(1605), - }, Field { label: "Reference".to_string(), - ty: DeclarationId(1606), - }, - Field { - label: "Record".to_string(), ty: DeclarationId(1608), }, Field { - label: "List".to_string(), + label: "Record".to_string(), ty: DeclarationId(1610), }, Field { - label: "Map".to_string(), + label: "List".to_string(), ty: DeclarationId(1612), }, Field { - label: "Variant".to_string(), + label: "Map".to_string(), ty: DeclarationId(1614), ->>>>>>> origin/main }, Field { label: "Variant".to_string(), - ty: DeclarationId(1615), + ty: DeclarationId(1616), }, ], }, @@ -18908,27 +18358,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueBodyUnparsed".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1616), - }, - Field { - label: "ValueBodyStructural".to_string(), - ty: DeclarationId(1618), -======= - ty: DeclarationId(1615), - }, - Field { - label: "ValueBodyStructural".to_string(), ty: DeclarationId(1617), }, Field { - label: "ValueBodyMap".to_string(), + label: "ValueBodyStructural".to_string(), ty: DeclarationId(1619), ->>>>>>> origin/main }, Field { label: "ValueBodyMap".to_string(), - ty: DeclarationId(1620), + ty: DeclarationId(1621), }, ], }, @@ -18968,43 +18406,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserDefined".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1621), - }, - Field { - label: "ExternalRealization".to_string(), ty: DeclarationId(1622), }, - Field { - label: "Pending".to_string(), - ty: DeclarationId(1623), - }, - Field { - label: "NoBody".to_string(), - ty: DeclarationId(1624), - }, - Field { - label: "Unparsed".to_string(), - ty: DeclarationId(1625), -======= - ty: DeclarationId(1620), - }, Field { label: "ExternalRealization".to_string(), - ty: DeclarationId(1621), + ty: DeclarationId(1623), }, Field { label: "Pending".to_string(), - ty: DeclarationId(1622), + ty: DeclarationId(1624), }, Field { label: "NoBody".to_string(), - ty: DeclarationId(1623), + ty: DeclarationId(1625), }, Field { label: "Unparsed".to_string(), - ty: DeclarationId(1624), ->>>>>>> origin/main + ty: DeclarationId(1626), }, ], }, @@ -19025,51 +18443,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Atom".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1626), + ty: DeclarationId(1627), }, Field { label: "Conj".to_string(), - ty: DeclarationId(1628), + ty: DeclarationId(1629), }, Field { label: "Disj".to_string(), - ty: DeclarationId(1630), + ty: DeclarationId(1631), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(1632), - }, - Field { - label: "Cardinality".to_string(), ty: DeclarationId(1633), -======= - ty: DeclarationId(1625), - }, - Field { - label: "Conj".to_string(), - ty: DeclarationId(1627), - }, - Field { - label: "Disj".to_string(), - ty: DeclarationId(1629), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(1631), ->>>>>>> origin/main }, Field { label: "Cardinality".to_string(), - ty: DeclarationId(1632), + ty: DeclarationId(1634), }, Field { label: "Instantiation".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1635), -======= - ty: DeclarationId(1634), ->>>>>>> origin/main + ty: DeclarationId(1636), }, ], }, @@ -19094,71 +18488,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1636), - }, - Field { - label: "connective".to_string(), - ty: DeclarationId(715), - }, - Field { - label: "type_params".to_string(), ty: DeclarationId(1637), }, - Field { - label: "phantom_params".to_string(), - ty: DeclarationId(1638), - }, - Field { - label: "meta_tag".to_string(), - ty: DeclarationId(1639), - }, - Field { - label: "inhabits".to_string(), - ty: DeclarationId(1640), - }, - Field { - label: "value_body".to_string(), - ty: DeclarationId(1641), - }, - Field { - label: "nominal_opacity".to_string(), - ty: DeclarationId(1642), - }, - Field { -======= - ty: DeclarationId(1635), - }, Field { label: "connective".to_string(), ty: DeclarationId(716), }, Field { label: "type_params".to_string(), - ty: DeclarationId(1636), + ty: DeclarationId(1638), }, Field { label: "phantom_params".to_string(), - ty: DeclarationId(1637), + ty: DeclarationId(1639), }, Field { label: "meta_tag".to_string(), - ty: DeclarationId(1638), + ty: DeclarationId(1640), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(1639), + ty: DeclarationId(1641), }, Field { label: "value_body".to_string(), - ty: DeclarationId(1640), + ty: DeclarationId(1642), }, Field { label: "nominal_opacity".to_string(), - ty: DeclarationId(1641), + ty: DeclarationId(1643), }, Field { ->>>>>>> origin/main label: "span".to_string(), ty: DeclarationId(132), }, @@ -19205,11 +18565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "permitted_accessors".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1643), -======= - ty: DeclarationId(1642), ->>>>>>> origin/main + ty: DeclarationId(1644), }], }, type_params: vec![], @@ -19229,35 +18585,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Add".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1644), - }, - Field { - label: "Sub".to_string(), ty: DeclarationId(1645), }, - Field { - label: "Mul".to_string(), - ty: DeclarationId(1646), - }, - Field { - label: "Div".to_string(), - ty: DeclarationId(1647), -======= - ty: DeclarationId(1643), - }, Field { label: "Sub".to_string(), - ty: DeclarationId(1644), + ty: DeclarationId(1646), }, Field { label: "Mul".to_string(), - ty: DeclarationId(1645), + ty: DeclarationId(1647), }, Field { label: "Div".to_string(), - ty: DeclarationId(1646), ->>>>>>> origin/main + ty: DeclarationId(1648), }, ], }, @@ -19278,51 +18618,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Eq".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1648), - }, - Field { - label: "Ne".to_string(), ty: DeclarationId(1649), }, - Field { - label: "Lt".to_string(), - ty: DeclarationId(1650), - }, - Field { - label: "Le".to_string(), - ty: DeclarationId(1651), - }, - Field { - label: "Gt".to_string(), - ty: DeclarationId(1652), - }, - Field { - label: "Ge".to_string(), - ty: DeclarationId(1653), -======= - ty: DeclarationId(1647), - }, Field { label: "Ne".to_string(), - ty: DeclarationId(1648), + ty: DeclarationId(1650), }, Field { label: "Lt".to_string(), - ty: DeclarationId(1649), + ty: DeclarationId(1651), }, Field { label: "Le".to_string(), - ty: DeclarationId(1650), + ty: DeclarationId(1652), }, Field { label: "Gt".to_string(), - ty: DeclarationId(1651), + ty: DeclarationId(1653), }, Field { label: "Ge".to_string(), - ty: DeclarationId(1652), ->>>>>>> origin/main + ty: DeclarationId(1654), }, ], }, @@ -19343,19 +18659,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "And".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1654), - }, - Field { - label: "Or".to_string(), ty: DeclarationId(1655), -======= - ty: DeclarationId(1653), }, Field { label: "Or".to_string(), - ty: DeclarationId(1654), ->>>>>>> origin/main + ty: DeclarationId(1656), }, ], }, @@ -19376,27 +18684,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Arithmetic".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1656), - }, - Field { - label: "Comparison".to_string(), ty: DeclarationId(1657), }, - Field { - label: "Logical".to_string(), - ty: DeclarationId(1658), -======= - ty: DeclarationId(1655), - }, Field { label: "Comparison".to_string(), - ty: DeclarationId(1656), ->>>>>>> origin/main + ty: DeclarationId(1658), }, Field { label: "Logical".to_string(), - ty: DeclarationId(1657), + ty: DeclarationId(1659), }, ], }, @@ -19417,27 +18713,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Callable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1659), -======= - ty: DeclarationId(1658), - }, - Field { - label: "FieldProject".to_string(), ty: DeclarationId(1660), ->>>>>>> origin/main }, Field { label: "FieldProject".to_string(), - ty: DeclarationId(1661), + ty: DeclarationId(1662), }, Field { label: "Operator".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1662), -======= - ty: DeclarationId(1661), ->>>>>>> origin/main + ty: DeclarationId(1663), }, ], }, @@ -19458,19 +18742,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnresolvedVariant".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1663), - }, - Field { - label: "ResolvedVariant".to_string(), ty: DeclarationId(1664), -======= - ty: DeclarationId(1662), }, Field { label: "ResolvedVariant".to_string(), - ty: DeclarationId(1663), ->>>>>>> origin/main + ty: DeclarationId(1665), }, ], }, @@ -19528,11 +18804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "binding".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1665), -======= - ty: DeclarationId(1664), ->>>>>>> origin/main + ty: DeclarationId(1666), }, ], }, @@ -19668,19 +18940,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "members".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1666), - }, - Field { - label: "intra_cluster_calls".to_string(), ty: DeclarationId(1667), -======= - ty: DeclarationId(1665), }, Field { label: "intra_cluster_calls".to_string(), - ty: DeclarationId(1666), ->>>>>>> origin/main + ty: DeclarationId(1668), }, ], }, @@ -19701,19 +18965,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Cardinality".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1668), - }, - Field { - label: "Descent".to_string(), ty: DeclarationId(1669), -======= - ty: DeclarationId(1667), }, Field { label: "Descent".to_string(), - ty: DeclarationId(1668), ->>>>>>> origin/main + ty: DeclarationId(1670), }, ], }, @@ -19768,11 +19024,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1670), -======= - ty: DeclarationId(1669), ->>>>>>> origin/main + ty: DeclarationId(1671), }, ], }, @@ -19801,11 +19053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1671), -======= - ty: DeclarationId(1670), ->>>>>>> origin/main + ty: DeclarationId(1672), }, Field { label: "result_port".to_string(), @@ -19833,11 +19081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserMatch".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1672), -======= - ty: DeclarationId(1671), ->>>>>>> origin/main + ty: DeclarationId(1673), }], }, type_params: vec![], @@ -19865,11 +19109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "paths".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1673), -======= - ty: DeclarationId(1672), ->>>>>>> origin/main + ty: DeclarationId(1674), }, Field { label: "result_port".to_string(), @@ -19881,11 +19121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "emit_participation".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1674), -======= - ty: DeclarationId(1673), ->>>>>>> origin/main + ty: DeclarationId(1675), }, ], }, @@ -19950,11 +19186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "UserCallable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1675), -======= - ty: DeclarationId(1674), ->>>>>>> origin/main + ty: DeclarationId(1676), }], }, type_params: vec![], @@ -19986,11 +19218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1676), -======= - ty: DeclarationId(1675), ->>>>>>> origin/main + ty: DeclarationId(1677), }, Field { label: "span".to_string(), @@ -19998,19 +19226,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "lane2_workflow".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1677), - }, - Field { - label: "emit_participation".to_string(), ty: DeclarationId(1678), -======= - ty: DeclarationId(1676), }, Field { label: "emit_participation".to_string(), - ty: DeclarationId(1677), ->>>>>>> origin/main + ty: DeclarationId(1679), }, ], }, @@ -20031,43 +19251,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Value".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1679), - }, - Field { - label: "Transform".to_string(), ty: DeclarationId(1680), }, - Field { - label: "Branch".to_string(), - ty: DeclarationId(1681), - }, - Field { - label: "Loop".to_string(), - ty: DeclarationId(1682), - }, - Field { - label: "Bind".to_string(), - ty: DeclarationId(1683), -======= - ty: DeclarationId(1678), - }, Field { label: "Transform".to_string(), - ty: DeclarationId(1679), + ty: DeclarationId(1681), }, Field { label: "Branch".to_string(), - ty: DeclarationId(1680), + ty: DeclarationId(1682), }, Field { label: "Loop".to_string(), - ty: DeclarationId(1681), + ty: DeclarationId(1683), }, Field { label: "Bind".to_string(), - ty: DeclarationId(1682), ->>>>>>> origin/main + ty: DeclarationId(1684), }, ], }, @@ -20088,35 +19288,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "declarations".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1684), - }, - Field { - label: "nodes".to_string(), ty: DeclarationId(1685), }, - Field { - label: "ports".to_string(), - ty: DeclarationId(1686), - }, - Field { - label: "clusters".to_string(), - ty: DeclarationId(1687), -======= - ty: DeclarationId(1683), - }, Field { label: "nodes".to_string(), - ty: DeclarationId(1684), + ty: DeclarationId(1686), }, Field { label: "ports".to_string(), - ty: DeclarationId(1685), + ty: DeclarationId(1687), }, Field { label: "clusters".to_string(), - ty: DeclarationId(1686), ->>>>>>> origin/main + ty: DeclarationId(1688), }, ], }, @@ -20156,27 +19340,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "accessor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "realization".to_string(), - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "language".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "realization".to_string(), - ty: DeclarationId(1085), - }, - Field { - label: "language".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -20188,45 +19360,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 18420, 18537), - }); - declarations.push(Declaration { - id: DeclarationId(747), - name: Some("port".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744), DeclarationId(641)], - output: DeclarationId(1574), - body: ArrowBody::Unparsed(SourceSpan::new( - "src/v3/std/substrate.dag", - 18579, - 18594, - )), - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18539, 18594), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 19343, 19460), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(748), name: Some("port".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(744), DeclarationId(640)], - output: DeclarationId(1575), -======= inputs: vec![DeclarationId(745), DeclarationId(641)], - output: DeclarationId(1573), ->>>>>>> origin/main + output: DeclarationId(1575), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19502, @@ -20247,13 +19388,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(749), name: Some("node".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(744), DeclarationId(641)], - output: DeclarationId(1576), -======= inputs: vec![DeclarationId(745), DeclarationId(640)], - output: DeclarationId(1574), ->>>>>>> origin/main + output: DeclarationId(1576), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19560, @@ -20274,13 +19410,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(750), name: Some("resolve_producer".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(744), DeclarationId(642)], - output: DeclarationId(1577), -======= inputs: vec![DeclarationId(745), DeclarationId(641)], - output: DeclarationId(1575), ->>>>>>> origin/main + output: DeclarationId(1577), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19635, @@ -20301,13 +19432,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(751), name: Some("declaration_by_id".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(744), DeclarationId(640)], - output: DeclarationId(1578), -======= inputs: vec![DeclarationId(745), DeclarationId(642)], - output: DeclarationId(1576), ->>>>>>> origin/main + output: DeclarationId(1578), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 20024, @@ -20329,7 +19455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("lane2_workflow_at".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745), DeclarationId(640)], - output: DeclarationId(1577), + output: DeclarationId(1579), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 20348, @@ -20353,27 +19479,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleRoot".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1688), - }, - Field { - label: "NoRoot".to_string(), ty: DeclarationId(1689), -======= - ty: DeclarationId(1687), ->>>>>>> origin/main }, Field { label: "NoRoot".to_string(), - ty: DeclarationId(1688), + ty: DeclarationId(1690), }, Field { label: "AmbiguousRoot".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1691), -======= - ty: DeclarationId(1690), ->>>>>>> origin/main + ty: DeclarationId(1692), }, ], }, @@ -20391,13 +19505,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(754), name: Some("workflow_root_port".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![], - output: DeclarationId(1579), -======= inputs: vec![DeclarationId(745)], output: DeclarationId(753), ->>>>>>> origin/main body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23967, @@ -20418,13 +19527,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(755), name: Some("miss_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(642)], - output: DeclarationId(1580), -======= inputs: vec![], - output: DeclarationId(1578), ->>>>>>> origin/main + output: DeclarationId(1580), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 24353, @@ -20446,7 +19550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_declaration_id_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(642)], - output: DeclarationId(1579), + output: DeclarationId(1581), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 24438, @@ -20469,11 +19573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }], }, type_params: vec![], @@ -20493,27 +19593,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShrinkEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1711), - }, - Field { - label: "ProjectionEffect".to_string(), ty: DeclarationId(1712), }, - Field { - label: "IdentityEffect".to_string(), - ty: DeclarationId(1713), -======= - ty: DeclarationId(1710), - }, Field { label: "ProjectionEffect".to_string(), - ty: DeclarationId(1711), ->>>>>>> origin/main + ty: DeclarationId(1713), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1712), + ty: DeclarationId(1714), }, ], }, @@ -20534,35 +19622,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ShapeConstant".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1714), - }, - Field { - label: "ShapeLinearScan".to_string(), ty: DeclarationId(1715), }, - Field { - label: "ShapeIterateBody".to_string(), - ty: DeclarationId(1716), - }, - Field { - label: "ShapeSortBody".to_string(), - ty: DeclarationId(1717), -======= - ty: DeclarationId(1713), - }, Field { label: "ShapeLinearScan".to_string(), - ty: DeclarationId(1714), + ty: DeclarationId(1716), }, Field { label: "ShapeIterateBody".to_string(), - ty: DeclarationId(1715), + ty: DeclarationId(1717), }, Field { label: "ShapeSortBody".to_string(), - ty: DeclarationId(1716), ->>>>>>> origin/main + ty: DeclarationId(1718), }, ], }, @@ -20591,27 +19663,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "size_effect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1718), - }, - Field { - label: "cost_shape".to_string(), ty: DeclarationId(1719), }, - Field { - label: "callback_element_position".to_string(), - ty: DeclarationId(1720), -======= - ty: DeclarationId(1717), - }, Field { label: "cost_shape".to_string(), - ty: DeclarationId(1718), ->>>>>>> origin/main + ty: DeclarationId(1720), }, Field { label: "callback_element_position".to_string(), - ty: DeclarationId(1719), + ty: DeclarationId(1721), }, ], }, @@ -20651,19 +19711,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DegreeTwo".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1721), - }, - Field { - label: "DegreeSuccessor".to_string(), ty: DeclarationId(1722), -======= - ty: DeclarationId(1720), }, Field { label: "DegreeSuccessor".to_string(), - ty: DeclarationId(1721), ->>>>>>> origin/main + ty: DeclarationId(1723), }, ], }, @@ -20684,59 +19736,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantCost".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1723), - }, - Field { - label: "LinearCost".to_string(), ty: DeclarationId(1724), }, - Field { - label: "PolynomialCost".to_string(), - ty: DeclarationId(1725), - }, - Field { - label: "ProductCost".to_string(), - ty: DeclarationId(1727), - }, - Field { - label: "SumCost".to_string(), - ty: DeclarationId(1729), - }, - Field { - label: "LogCost".to_string(), - ty: DeclarationId(1730), - }, - Field { - label: "UnknownCost".to_string(), - ty: DeclarationId(1731), -======= - ty: DeclarationId(1722), - }, Field { label: "LinearCost".to_string(), - ty: DeclarationId(1723), + ty: DeclarationId(1725), }, Field { label: "PolynomialCost".to_string(), - ty: DeclarationId(1724), + ty: DeclarationId(1726), }, Field { label: "ProductCost".to_string(), - ty: DeclarationId(1726), + ty: DeclarationId(1728), }, Field { label: "SumCost".to_string(), - ty: DeclarationId(1728), + ty: DeclarationId(1730), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(1729), ->>>>>>> origin/main + ty: DeclarationId(1731), }, Field { label: "UnknownCost".to_string(), - ty: DeclarationId(1730), + ty: DeclarationId(1732), }, ], }, @@ -20798,11 +19822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(1692), -======= - output: DeclarationId(1691), ->>>>>>> origin/main + output: DeclarationId(1693), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9870, 9880)), }, type_params: vec![], @@ -20819,13 +19839,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(767), name: Some("hit_symbolic_cost_lookup".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(762)], - output: DeclarationId(1693), -======= inputs: vec![DeclarationId(763)], - output: DeclarationId(1692), ->>>>>>> origin/main + output: DeclarationId(1694), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9954, 9969)), }, type_params: vec![], @@ -20842,15 +19857,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(768), name: Some("two_terms".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(762), DeclarationId(762)], - output: DeclarationId(1694), - body: ArrowBody::UserDefined(NodeId(10)), -======= inputs: vec![DeclarationId(763), DeclarationId(763)], - output: DeclarationId(1693), + output: DeclarationId(1695), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(10))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -20866,15 +19875,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(769), name: Some("many_terms".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(762), DeclarationId(762), DeclarationId(1695)], - output: DeclarationId(1696), - body: ArrowBody::UserDefined(NodeId(12)), -======= - inputs: vec![DeclarationId(763), DeclarationId(763), DeclarationId(1694)], - output: DeclarationId(1695), + inputs: vec![DeclarationId(763), DeclarationId(763), DeclarationId(1696)], + output: DeclarationId(1697), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(12))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -20998,15 +20001,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(776), name: Some("max_path".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1697)], - output: DeclarationId(762), - body: ArrowBody::UserDefined(NodeId(45)), -======= - inputs: vec![DeclarationId(1696)], + inputs: vec![DeclarationId(1698)], output: DeclarationId(763), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(45))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21076,15 +20073,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(780), name: Some("nsl_to_list".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1698)], - output: DeclarationId(1699), - body: ArrowBody::UserDefined(NodeId(116)), -======= - inputs: vec![DeclarationId(1697)], - output: DeclarationId(1698), + inputs: vec![DeclarationId(1699)], + output: DeclarationId(1700), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(116))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21100,15 +20091,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(781), name: Some("drop_zero".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1700)], - output: DeclarationId(1701), - body: ArrowBody::UserDefined(NodeId(129)), -======= - inputs: vec![DeclarationId(1699)], - output: DeclarationId(1700), + inputs: vec![DeclarationId(1701)], + output: DeclarationId(1702), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(129))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21142,15 +20127,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(783), name: Some("reduce_sum".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1702)], - output: DeclarationId(762), - body: ArrowBody::UserDefined(NodeId(151)), -======= - inputs: vec![DeclarationId(1701)], + inputs: vec![DeclarationId(1703)], output: DeclarationId(763), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(151))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21166,15 +20145,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(784), name: Some("wrap_sum".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1703)], - output: DeclarationId(762), - body: ArrowBody::UserDefined(NodeId(163)), -======= - inputs: vec![DeclarationId(1702)], + inputs: vec![DeclarationId(1704)], output: DeclarationId(763), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(163))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21190,15 +20163,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(785), name: Some("reduce_product".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1704)], - output: DeclarationId(762), - body: ArrowBody::UserDefined(NodeId(180)), -======= - inputs: vec![DeclarationId(1703)], + inputs: vec![DeclarationId(1705)], output: DeclarationId(763), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(180))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21345,15 +20312,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(793), name: Some("filter_not_dominated_by".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1705), DeclarationId(762)], - output: DeclarationId(1706), - body: ArrowBody::UserDefined(NodeId(228)), -======= - inputs: vec![DeclarationId(1704), DeclarationId(763)], - output: DeclarationId(1705), + inputs: vec![DeclarationId(1706), DeclarationId(763)], + output: DeclarationId(1707), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(228))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21369,15 +20330,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(794), name: Some("drop_dominated_step".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1707), DeclarationId(762)], - output: DeclarationId(1708), - body: ArrowBody::UserDefined(NodeId(235)), -======= - inputs: vec![DeclarationId(1706), DeclarationId(763)], - output: DeclarationId(1707), + inputs: vec![DeclarationId(1708), DeclarationId(763)], + output: DeclarationId(1709), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(235))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21393,15 +20348,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(795), name: Some("drop_dominated".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1709)], - output: DeclarationId(1710), - body: ArrowBody::UserDefined(NodeId(238)), -======= - inputs: vec![DeclarationId(1708)], - output: DeclarationId(1709), + inputs: vec![DeclarationId(1710)], + output: DeclarationId(1711), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(238))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21420,17 +20369,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inputs: vec![ DeclarationId(118), DeclarationId(197), -<<<<<<< HEAD - DeclarationId(1755), - DeclarationId(81), DeclarationId(1756), - DeclarationId(1757), -======= - DeclarationId(1754), DeclarationId(81), - DeclarationId(1755), - DeclarationId(1756), ->>>>>>> origin/main + DeclarationId(1757), + DeclarationId(1758), ], output: DeclarationId(804), body: ArrowBody::Unparsed(SourceSpan::new( @@ -21456,20 +20398,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1032), -======= - value: DeclarationId(1031), ->>>>>>> origin/main + value: DeclarationId(1033), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1758)), -======= - meta_tag: Some(DeclarationId(1757)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1759)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![])), @@ -21484,19 +20418,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserMessage".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1760), - }, - Field { - label: "AssistantMessage".to_string(), - ty: DeclarationId(1762), -======= - ty: DeclarationId(1759), + ty: DeclarationId(1761), }, Field { label: "AssistantMessage".to_string(), - ty: DeclarationId(1761), ->>>>>>> origin/main + ty: DeclarationId(1763), }, ], }, @@ -21517,19 +20443,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UserTextBlock".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1763), - }, - Field { - label: "UserToolResultBlock".to_string(), - ty: DeclarationId(1765), -======= - ty: DeclarationId(1762), + ty: DeclarationId(1764), }, Field { label: "UserToolResultBlock".to_string(), - ty: DeclarationId(1764), ->>>>>>> origin/main + ty: DeclarationId(1766), }, ], }, @@ -21550,19 +20468,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AssistantTextBlock".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1766), - }, - Field { - label: "AssistantToolUseBlock".to_string(), ty: DeclarationId(1767), -======= - ty: DeclarationId(1765), }, Field { label: "AssistantToolUseBlock".to_string(), - ty: DeclarationId(1766), ->>>>>>> origin/main + ty: DeclarationId(1768), }, ], }, @@ -21583,59 +20493,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EndTurn".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1768), - }, - Field { - label: "MaxTokens".to_string(), ty: DeclarationId(1769), }, - Field { - label: "StopSequence".to_string(), - ty: DeclarationId(1770), - }, - Field { - label: "ToolUse".to_string(), - ty: DeclarationId(1771), - }, - Field { - label: "PauseTurn".to_string(), - ty: DeclarationId(1772), - }, - Field { - label: "Refusal".to_string(), - ty: DeclarationId(1773), - }, - Field { - label: "ModelContextWindowExceeded".to_string(), - ty: DeclarationId(1774), -======= - ty: DeclarationId(1767), - }, Field { label: "MaxTokens".to_string(), - ty: DeclarationId(1768), + ty: DeclarationId(1770), }, Field { label: "StopSequence".to_string(), - ty: DeclarationId(1769), + ty: DeclarationId(1771), }, Field { label: "ToolUse".to_string(), - ty: DeclarationId(1770), + ty: DeclarationId(1772), }, Field { label: "PauseTurn".to_string(), - ty: DeclarationId(1771), + ty: DeclarationId(1773), }, Field { label: "Refusal".to_string(), - ty: DeclarationId(1772), + ty: DeclarationId(1774), }, Field { label: "ModelContextWindowExceeded".to_string(), - ty: DeclarationId(1773), ->>>>>>> origin/main + ty: DeclarationId(1775), }, ], }, @@ -21718,11 +20600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "content".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1775), -======= - ty: DeclarationId(1774), ->>>>>>> origin/main + ty: DeclarationId(1776), }, Field { label: "model".to_string(), @@ -21734,11 +20612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "stop_sequence".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1776), -======= - ty: DeclarationId(1775), ->>>>>>> origin/main + ty: DeclarationId(1777), }, Field { label: "usage".to_string(), @@ -21763,43 +20637,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ToNearestEven".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1777), - }, - Field { - label: "ToZero".to_string(), ty: DeclarationId(1778), }, - Field { - label: "ToPositiveInfinity".to_string(), - ty: DeclarationId(1779), - }, - Field { - label: "ToNegativeInfinity".to_string(), - ty: DeclarationId(1780), - }, - Field { - label: "ToAwayFromZero".to_string(), - ty: DeclarationId(1781), -======= - ty: DeclarationId(1776), - }, Field { label: "ToZero".to_string(), - ty: DeclarationId(1777), + ty: DeclarationId(1779), }, Field { label: "ToPositiveInfinity".to_string(), - ty: DeclarationId(1778), + ty: DeclarationId(1780), }, Field { label: "ToNegativeInfinity".to_string(), - ty: DeclarationId(1779), + ty: DeclarationId(1781), }, Field { label: "ToAwayFromZero".to_string(), - ty: DeclarationId(1780), ->>>>>>> origin/main + ty: DeclarationId(1782), }, ], }, @@ -21820,27 +20674,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Unbounded".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1782), - }, - Field { - label: "BinaryPrecision".to_string(), ty: DeclarationId(1783), }, - Field { - label: "DecimalPrecision".to_string(), - ty: DeclarationId(1784), -======= - ty: DeclarationId(1781), - }, Field { label: "BinaryPrecision".to_string(), - ty: DeclarationId(1782), ->>>>>>> origin/main + ty: DeclarationId(1784), }, Field { label: "DecimalPrecision".to_string(), - ty: DeclarationId(1783), + ty: DeclarationId(1785), }, ], }, @@ -21861,27 +20703,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoNaN".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1785), - }, - Field { - label: "QuietNaN".to_string(), ty: DeclarationId(1786), }, - Field { - label: "QuietAndSignalingNaN".to_string(), - ty: DeclarationId(1787), -======= - ty: DeclarationId(1784), - }, Field { label: "QuietNaN".to_string(), - ty: DeclarationId(1785), ->>>>>>> origin/main + ty: DeclarationId(1787), }, Field { label: "QuietAndSignalingNaN".to_string(), - ty: DeclarationId(1786), + ty: DeclarationId(1788), }, ], }, @@ -21902,19 +20732,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoInfinity".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1788), - }, - Field { - label: "SignedInfinity".to_string(), ty: DeclarationId(1789), -======= - ty: DeclarationId(1787), }, Field { label: "SignedInfinity".to_string(), - ty: DeclarationId(1788), ->>>>>>> origin/main + ty: DeclarationId(1790), }, ], }, @@ -21935,19 +20757,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoSignedZero".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1790), - }, - Field { - label: "SignedZero".to_string(), ty: DeclarationId(1791), -======= - ty: DeclarationId(1789), }, Field { label: "SignedZero".to_string(), - ty: DeclarationId(1790), ->>>>>>> origin/main + ty: DeclarationId(1792), }, ], }, @@ -21968,27 +20782,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoSubnormals".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1792), - }, - Field { - label: "GradualUnderflow".to_string(), ty: DeclarationId(1793), }, - Field { - label: "FlushToZero".to_string(), - ty: DeclarationId(1794), -======= - ty: DeclarationId(1791), - }, Field { label: "GradualUnderflow".to_string(), - ty: DeclarationId(1792), ->>>>>>> origin/main + ty: DeclarationId(1794), }, Field { label: "FlushToZero".to_string(), - ty: DeclarationId(1793), + ty: DeclarationId(1795), }, ], }, @@ -22038,11 +20840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "base".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1795), -======= - ty: DeclarationId(1794), ->>>>>>> origin/main + ty: DeclarationId(1796), }, Field { label: "rounding".to_string(), @@ -22101,11 +20899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "entry".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -22126,43 +20920,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StdAuthority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1796), - }, - Field { - label: "V3StdAuthority".to_string(), ty: DeclarationId(1797), }, - Field { - label: "V3SpecAuthority".to_string(), - ty: DeclarationId(1798), - }, - Field { - label: "CompilerAuthority".to_string(), - ty: DeclarationId(1799), - }, - Field { - label: "ExtdepsFixtureAuthority".to_string(), - ty: DeclarationId(1800), -======= - ty: DeclarationId(1795), - }, Field { label: "V3StdAuthority".to_string(), - ty: DeclarationId(1796), + ty: DeclarationId(1798), }, Field { label: "V3SpecAuthority".to_string(), - ty: DeclarationId(1797), + ty: DeclarationId(1799), }, Field { label: "CompilerAuthority".to_string(), - ty: DeclarationId(1798), + ty: DeclarationId(1800), }, Field { label: "ExtdepsFixtureAuthority".to_string(), - ty: DeclarationId(1799), ->>>>>>> origin/main + ty: DeclarationId(1801), }, ], }, @@ -22219,627 +20993,399 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "dsl/std/logic.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/bit.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/error_primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/magnitude.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/nat.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/integer.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/rational.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/float.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/types.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/string_type.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/unicode.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/render_repeat_string_bootstrap.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "dsl/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "src/v3/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/anthropic_messages.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/anthropic_operations.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/anthropic_schema.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/approximate_field.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/bin_shim.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/bootstrap_authority.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/bridge_ledger.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/clean_emission.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/computation.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/computation_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/diagnostics.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/dimensions.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/effects.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/emit_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/go_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/induction.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/integer_diagnostic_order.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/lens.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/list.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/lookup.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/parse_surface.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/python_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/resources.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/runtime.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/rust_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/services.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/substrate.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/substrate_minimal.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/termination.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/tokenize.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/verification.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/std/workflows.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "src/v3/spec/v3_l1.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1798), -======= - constructor: DeclarationId(1797), ->>>>>>> origin/main + constructor: DeclarationId(1799), payload: vec![], }, ), ( "src/v3/spec/go.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1798), -======= - constructor: DeclarationId(1797), ->>>>>>> origin/main + constructor: DeclarationId(1799), payload: vec![], }, ), ( "src/v3/spec/python.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1798), -======= - constructor: DeclarationId(1797), ->>>>>>> origin/main + constructor: DeclarationId(1799), payload: vec![], }, ), ( "src/v3/spec/rust.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1798), -======= - constructor: DeclarationId(1797), ->>>>>>> origin/main + constructor: DeclarationId(1799), payload: vec![], }, ), ( "src/v3/compiler/pipeline.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1799), -======= - constructor: DeclarationId(1798), ->>>>>>> origin/main + constructor: DeclarationId(1800), payload: vec![], }, ), ( "src/v3/compiler/operators.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1799), -======= - constructor: DeclarationId(1798), ->>>>>>> origin/main + constructor: DeclarationId(1800), payload: vec![], }, ), ( "src/v3/compiler/regen.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1799), -======= - constructor: DeclarationId(1798), ->>>>>>> origin/main + constructor: DeclarationId(1800), payload: vec![], }, ), ( "dsl/extdeps/languages/rust/primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1800), -======= - constructor: DeclarationId(1799), ->>>>>>> origin/main + constructor: DeclarationId(1801), payload: vec![], }, ), @@ -22857,19 +21403,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Retired".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1801), - }, - Field { - label: "Open".to_string(), ty: DeclarationId(1802), -======= - ty: DeclarationId(1800), }, Field { label: "Open".to_string(), - ty: DeclarationId(1801), ->>>>>>> origin/main + ty: DeclarationId(1803), }, ], }, @@ -22889,11 +21427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }], }, type_params: vec![], @@ -22939,11 +21473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 5984, 6094), }); -<<<<<<< HEAD - declarations.push(Declaration { id: DeclarationId(820), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(819) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1803)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1802), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1801), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1801), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1802), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1802), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1802), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); -======= - declarations.push(Declaration { id: DeclarationId(821), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(820) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1802)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1801), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1800), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1800), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1801), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1801), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1801), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); ->>>>>>> origin/main + declarations.push(Declaration { id: DeclarationId(821), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(820) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1804)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1803), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1802), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1802), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1803), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1803), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1803), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); declarations.push(Declaration { id: DeclarationId(822), name: Some("CleanEmissionContract".to_string()), @@ -23029,27 +21559,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapEverything".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1804), - }, - Field { - label: "WrapOnlyInOperandPosition".to_string(), ty: DeclarationId(1805), }, - Field { - label: "NoWrapping".to_string(), - ty: DeclarationId(1806), -======= - ty: DeclarationId(1803), - }, Field { label: "WrapOnlyInOperandPosition".to_string(), - ty: DeclarationId(1804), ->>>>>>> origin/main + ty: DeclarationId(1806), }, Field { label: "NoWrapping".to_string(), - ty: DeclarationId(1805), + ty: DeclarationId(1807), }, ], }, @@ -23070,35 +21588,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitBindingAlways".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1807), - }, - Field { - label: "EmitUnderscoreWhenUnused".to_string(), ty: DeclarationId(1808), }, - Field { - label: "EmitPrefixedUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1809), - }, - Field { - label: "NotApplicablePatternBinding".to_string(), - ty: DeclarationId(1810), -======= - ty: DeclarationId(1806), - }, Field { label: "EmitUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1807), + ty: DeclarationId(1809), }, Field { label: "EmitPrefixedUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1808), + ty: DeclarationId(1810), }, Field { label: "NotApplicablePatternBinding".to_string(), - ty: DeclarationId(1809), ->>>>>>> origin/main + ty: DeclarationId(1811), }, ], }, @@ -23119,19 +21621,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AccessFromPayloadBinding".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1811), - }, - Field { - label: "OverrideNamedFieldsAtBindingSite".to_string(), ty: DeclarationId(1812), -======= - ty: DeclarationId(1810), }, Field { label: "OverrideNamedFieldsAtBindingSite".to_string(), - ty: DeclarationId(1811), ->>>>>>> origin/main + ty: DeclarationId(1813), }, ], }, @@ -23152,27 +21646,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ImportEverythingDeclared".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1813), - }, - Field { - label: "IncludeOnlyReferenced".to_string(), ty: DeclarationId(1814), }, - Field { - label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(1815), -======= - ty: DeclarationId(1812), - }, Field { label: "IncludeOnlyReferenced".to_string(), - ty: DeclarationId(1813), ->>>>>>> origin/main + ty: DeclarationId(1815), }, Field { label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(1814), + ty: DeclarationId(1816), }, ], }, @@ -23193,27 +21675,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapReturnValue".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1816), - }, - Field { - label: "NoWrappingOnTerminalExpression".to_string(), ty: DeclarationId(1817), }, - Field { - label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(1818), -======= - ty: DeclarationId(1815), - }, Field { label: "NoWrappingOnTerminalExpression".to_string(), - ty: DeclarationId(1816), ->>>>>>> origin/main + ty: DeclarationId(1818), }, Field { label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(1817), + ty: DeclarationId(1819), }, ], }, @@ -23234,27 +21704,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "EmitLetBindingAlways".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1819), - }, - Field { - label: "EmitLetUnderscoreWhenUnused".to_string(), ty: DeclarationId(1820), }, - Field { - label: "OmitLetBinding".to_string(), - ty: DeclarationId(1821), -======= - ty: DeclarationId(1818), - }, Field { label: "EmitLetUnderscoreWhenUnused".to_string(), - ty: DeclarationId(1819), ->>>>>>> origin/main + ty: DeclarationId(1821), }, Field { label: "OmitLetBinding".to_string(), - ty: DeclarationId(1820), + ty: DeclarationId(1822), }, ], }, @@ -23275,27 +21733,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "WrapBody".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1822), - }, - Field { - label: "NoWrappingOnNonComplexBody".to_string(), ty: DeclarationId(1823), }, - Field { - label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(1824), -======= - ty: DeclarationId(1821), - }, Field { label: "NoWrappingOnNonComplexBody".to_string(), - ty: DeclarationId(1822), ->>>>>>> origin/main + ty: DeclarationId(1824), }, Field { label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(1823), + ty: DeclarationId(1825), }, ], }, @@ -23353,11 +21799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1825), -======= - ty: DeclarationId(1824), ->>>>>>> origin/main + ty: DeclarationId(1826), }, Field { label: "syntax_only".to_string(), @@ -23390,35 +21832,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IgnoreVerifierOutput".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1826), - }, - Field { - label: "RequireEmptyStdout".to_string(), ty: DeclarationId(1827), }, - Field { - label: "RequireEmptyStderr".to_string(), - ty: DeclarationId(1828), - }, - Field { - label: "RequireEmptyStdoutAndStderr".to_string(), - ty: DeclarationId(1829), -======= - ty: DeclarationId(1825), - }, Field { label: "RequireEmptyStdout".to_string(), - ty: DeclarationId(1826), + ty: DeclarationId(1828), }, Field { label: "RequireEmptyStderr".to_string(), - ty: DeclarationId(1827), + ty: DeclarationId(1829), }, Field { label: "RequireEmptyStdoutAndStderr".to_string(), - ty: DeclarationId(1828), ->>>>>>> origin/main + ty: DeclarationId(1830), }, ], }, @@ -23439,67 +21865,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CollectionSize".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1834), - }, - Field { - label: "ParserStreamSize".to_string(), ty: DeclarationId(1835), }, - Field { - label: "WorklistDrainSize".to_string(), - ty: DeclarationId(1836), - }, - Field { - label: "TreeSize".to_string(), - ty: DeclarationId(1837), - }, - Field { - label: "ArithmeticParam".to_string(), - ty: DeclarationId(1838), - }, - Field { - label: "ExplicitCountZero".to_string(), - ty: DeclarationId(1839), - }, - Field { - label: "ExplicitCountPositive".to_string(), - ty: DeclarationId(1840), - }, - Field { - label: "Forever".to_string(), - ty: DeclarationId(1841), -======= - ty: DeclarationId(1833), - }, Field { label: "ParserStreamSize".to_string(), - ty: DeclarationId(1834), + ty: DeclarationId(1836), }, Field { label: "WorklistDrainSize".to_string(), - ty: DeclarationId(1835), + ty: DeclarationId(1837), }, Field { label: "TreeSize".to_string(), - ty: DeclarationId(1836), + ty: DeclarationId(1838), }, Field { label: "ArithmeticParam".to_string(), - ty: DeclarationId(1837), + ty: DeclarationId(1839), }, Field { label: "ExplicitCountZero".to_string(), - ty: DeclarationId(1838), + ty: DeclarationId(1840), }, Field { label: "ExplicitCountPositive".to_string(), - ty: DeclarationId(1839), + ty: DeclarationId(1841), }, Field { label: "Forever".to_string(), - ty: DeclarationId(1840), ->>>>>>> origin/main + ty: DeclarationId(1842), }, ], }, @@ -23539,11 +21933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(836), name: Some("positive_descent_count".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1041)], -======= - inputs: vec![DeclarationId(1040)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1042)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", @@ -23568,67 +21958,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ChildAccessorCall".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1842), - }, - Field { - label: "CollectionShrinkCall".to_string(), ty: DeclarationId(1843), }, - Field { - label: "ArithmeticSubtractCall".to_string(), - ty: DeclarationId(1844), - }, - Field { - label: "ArithmeticDivideCall".to_string(), - ty: DeclarationId(1845), - }, - Field { - label: "ParserAdvanceCall".to_string(), - ty: DeclarationId(1846), - }, - Field { - label: "WorklistDrainCall".to_string(), - ty: DeclarationId(1847), - }, - Field { - label: "FoldBodyCall".to_string(), - ty: DeclarationId(1848), - }, - Field { - label: "SameArgumentCall".to_string(), - ty: DeclarationId(1849), -======= - ty: DeclarationId(1841), - }, Field { label: "CollectionShrinkCall".to_string(), - ty: DeclarationId(1842), + ty: DeclarationId(1844), }, Field { label: "ArithmeticSubtractCall".to_string(), - ty: DeclarationId(1843), + ty: DeclarationId(1845), }, Field { label: "ArithmeticDivideCall".to_string(), - ty: DeclarationId(1844), + ty: DeclarationId(1846), }, Field { label: "ParserAdvanceCall".to_string(), - ty: DeclarationId(1845), + ty: DeclarationId(1847), }, Field { label: "WorklistDrainCall".to_string(), - ty: DeclarationId(1846), + ty: DeclarationId(1848), }, Field { label: "FoldBodyCall".to_string(), - ty: DeclarationId(1847), + ty: DeclarationId(1849), }, Field { label: "SameArgumentCall".to_string(), - ty: DeclarationId(1848), ->>>>>>> origin/main + ty: DeclarationId(1850), }, ], }, @@ -23649,27 +22007,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnitShrink".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1850), - }, - Field { - label: "ConstantShrink".to_string(), ty: DeclarationId(1851), }, - Field { - label: "ProportionalShrink".to_string(), - ty: DeclarationId(1852), -======= - ty: DeclarationId(1849), - }, Field { label: "ConstantShrink".to_string(), - ty: DeclarationId(1850), ->>>>>>> origin/main + ty: DeclarationId(1852), }, Field { label: "ProportionalShrink".to_string(), - ty: DeclarationId(1851), + ty: DeclarationId(1853), }, ], }, @@ -23690,27 +22036,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Fold".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1853), - }, - Field { - label: "Descend".to_string(), ty: DeclarationId(1854), }, - Field { - label: "Repeat".to_string(), - ty: DeclarationId(1855), -======= - ty: DeclarationId(1852), - }, Field { label: "Descend".to_string(), - ty: DeclarationId(1853), ->>>>>>> origin/main + ty: DeclarationId(1855), }, Field { label: "Repeat".to_string(), - ty: DeclarationId(1854), + ty: DeclarationId(1856), }, ], }, @@ -23739,19 +22073,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1033), - }, - Field { - label: "factor".to_string(), - ty: DeclarationId(1856), -======= - ty: DeclarationId(1032), + ty: DeclarationId(1034), }, Field { label: "factor".to_string(), - ty: DeclarationId(1855), ->>>>>>> origin/main + ty: DeclarationId(1857), }, ], }, @@ -23791,13 +22117,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(842), name: Some("size_bound_param".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(833)], - output: DeclarationId(1830), -======= inputs: vec![DeclarationId(834)], - output: DeclarationId(1829), ->>>>>>> origin/main + output: DeclarationId(1831), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5369, @@ -23862,13 +22183,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(845), name: Some("constant_bound_value".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(833)], - output: DeclarationId(1831), -======= inputs: vec![DeclarationId(834)], - output: DeclarationId(1830), ->>>>>>> origin/main + output: DeclarationId(1832), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6297, @@ -23892,27 +22208,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TreeDescent".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1857), - }, - Field { - label: "CollectionFold".to_string(), ty: DeclarationId(1858), }, - Field { - label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(1859), -======= - ty: DeclarationId(1856), - }, Field { label: "CollectionFold".to_string(), - ty: DeclarationId(1857), ->>>>>>> origin/main + ty: DeclarationId(1859), }, Field { label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(1858), + ty: DeclarationId(1860), }, ], }, @@ -23931,11 +22235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("algebra_profile_to_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(53)], -<<<<<<< HEAD - output: DeclarationId(1832), -======= - output: DeclarationId(1831), ->>>>>>> origin/main + output: DeclarationId(1833), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7370, @@ -23957,11 +22257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("type_iteration_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], -<<<<<<< HEAD - output: DeclarationId(1833), -======= - output: DeclarationId(1832), ->>>>>>> origin/main + output: DeclarationId(1834), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7935, @@ -23985,19 +22281,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Immutable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1860), - }, - Field { - label: "Mutable".to_string(), ty: DeclarationId(1861), -======= - ty: DeclarationId(1859), }, Field { label: "Mutable".to_string(), - ty: DeclarationId(1860), ->>>>>>> origin/main + ty: DeclarationId(1862), }, ], }, @@ -24018,19 +22306,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Pure".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1862), - }, - Field { - label: "Effectful".to_string(), ty: DeclarationId(1863), -======= - ty: DeclarationId(1861), }, Field { label: "Effectful".to_string(), - ty: DeclarationId(1862), ->>>>>>> origin/main + ty: DeclarationId(1864), }, ], }, @@ -24051,19 +22331,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ExplicitDAG".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1864), - }, - Field { - label: "Arbitrary".to_string(), ty: DeclarationId(1865), -======= - ty: DeclarationId(1863), }, Field { label: "Arbitrary".to_string(), - ty: DeclarationId(1864), ->>>>>>> origin/main + ty: DeclarationId(1866), }, ], }, @@ -24084,19 +22356,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Bounded".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1866), - }, - Field { - label: "Unbounded".to_string(), ty: DeclarationId(1867), -======= - ty: DeclarationId(1865), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1866), ->>>>>>> origin/main + ty: DeclarationId(1868), }, ], }, @@ -24160,44 +22424,28 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "mutability".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1860), -======= - constructor: DeclarationId(1859), ->>>>>>> origin/main + constructor: DeclarationId(1861), payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1862), -======= - constructor: DeclarationId(1861), ->>>>>>> origin/main + constructor: DeclarationId(1863), payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1864), -======= - constructor: DeclarationId(1863), ->>>>>>> origin/main + constructor: DeclarationId(1865), payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1866), -======= - constructor: DeclarationId(1865), ->>>>>>> origin/main + constructor: DeclarationId(1867), payload: vec![], }, ), @@ -24214,35 +22462,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ValueOnly".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1868), - }, - Field { - label: "GarbageCollected".to_string(), ty: DeclarationId(1869), }, - Field { - label: "RefCounted".to_string(), - ty: DeclarationId(1870), - }, - Field { - label: "OwnershipBased".to_string(), - ty: DeclarationId(1871), -======= - ty: DeclarationId(1867), - }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(1868), + ty: DeclarationId(1870), }, Field { label: "RefCounted".to_string(), - ty: DeclarationId(1869), + ty: DeclarationId(1871), }, Field { label: "OwnershipBased".to_string(), - ty: DeclarationId(1870), ->>>>>>> origin/main + ty: DeclarationId(1872), }, ], }, @@ -24263,19 +22495,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LexicalScoping".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1872), - }, - Field { - label: "DynamicScoping".to_string(), ty: DeclarationId(1873), -======= - ty: DeclarationId(1871), }, Field { label: "DynamicScoping".to_string(), - ty: DeclarationId(1872), ->>>>>>> origin/main + ty: DeclarationId(1874), }, ], }, @@ -24320,11 +22544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "excluded_prefixes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1874), -======= - ty: DeclarationId(1873), ->>>>>>> origin/main + ty: DeclarationId(1875), }], }, type_params: vec![], @@ -24348,11 +22568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "additional_excluded_prefixes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1875), -======= - ty: DeclarationId(1874), ->>>>>>> origin/main + ty: DeclarationId(1876), }, ], }, @@ -24400,19 +22616,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "OwnershipBased".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1876), - }, - Field { - label: "GarbageCollected".to_string(), ty: DeclarationId(1877), -======= - ty: DeclarationId(1875), }, Field { label: "GarbageCollected".to_string(), - ty: DeclarationId(1876), ->>>>>>> origin/main + ty: DeclarationId(1878), }, ], }, @@ -24433,59 +22641,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TokenizerError".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1878), - }, - Field { - label: "ParseError".to_string(), ty: DeclarationId(1879), }, - Field { - label: "TypeMismatch".to_string(), - ty: DeclarationId(1880), - }, - Field { - label: "UnitMismatch".to_string(), - ty: DeclarationId(1881), - }, - Field { - label: "ArityMismatch".to_string(), - ty: DeclarationId(1882), - }, - Field { - label: "ResolveError".to_string(), - ty: DeclarationId(1883), - }, - Field { - label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(1884), -======= - ty: DeclarationId(1877), - }, Field { label: "ParseError".to_string(), - ty: DeclarationId(1878), + ty: DeclarationId(1880), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(1879), + ty: DeclarationId(1881), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(1880), + ty: DeclarationId(1882), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(1881), + ty: DeclarationId(1883), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(1882), + ty: DeclarationId(1884), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(1883), ->>>>>>> origin/main + ty: DeclarationId(1885), }, ], }, @@ -24559,11 +22739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "kind_decl".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }], }, type_params: vec![], @@ -24583,19 +22759,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CompilerKind".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1885), - }, - Field { - label: "LensInstanceKind".to_string(), ty: DeclarationId(1886), -======= - ty: DeclarationId(1884), }, Field { label: "LensInstanceKind".to_string(), - ty: DeclarationId(1885), ->>>>>>> origin/main + ty: DeclarationId(1887), }, ], }, @@ -24628,11 +22796,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fixes".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1887), -======= - ty: DeclarationId(1886), ->>>>>>> origin/main + ty: DeclarationId(1888), }, ], }, @@ -24653,59 +22817,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UnderRefined".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1888), - }, - Field { - label: "NoInhabitant".to_string(), ty: DeclarationId(1889), }, - Field { - label: "ContradictoryUse".to_string(), - ty: DeclarationId(1891), - }, - Field { - label: "OutOfR2Scope".to_string(), - ty: DeclarationId(1892), - }, - Field { - label: "LifetimeProgramExtractionPending".to_string(), - ty: DeclarationId(1893), - }, - Field { - label: "FoldNotImplemented".to_string(), - ty: DeclarationId(1894), - }, - Field { - label: "MissingEmissionPath".to_string(), - ty: DeclarationId(1895), -======= - ty: DeclarationId(1887), - }, Field { label: "NoInhabitant".to_string(), - ty: DeclarationId(1888), + ty: DeclarationId(1890), }, Field { label: "ContradictoryUse".to_string(), - ty: DeclarationId(1890), + ty: DeclarationId(1892), }, Field { label: "OutOfR2Scope".to_string(), - ty: DeclarationId(1891), + ty: DeclarationId(1893), }, Field { label: "LifetimeProgramExtractionPending".to_string(), - ty: DeclarationId(1892), + ty: DeclarationId(1894), }, Field { label: "FoldNotImplemented".to_string(), - ty: DeclarationId(1893), + ty: DeclarationId(1895), }, Field { label: "MissingEmissionPath".to_string(), - ty: DeclarationId(1894), ->>>>>>> origin/main + ty: DeclarationId(1896), }, ], }, @@ -24726,19 +22862,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Inhabits".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1910), - }, - Field { - label: "Violates".to_string(), ty: DeclarationId(1911), -======= - ty: DeclarationId(1909), }, Field { label: "Violates".to_string(), - ty: DeclarationId(1910), ->>>>>>> origin/main + ty: DeclarationId(1912), }, ], }, @@ -24773,19 +22901,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "NoDiagnostic".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1912), - }, - Field { - label: "SomeDiagnostic".to_string(), ty: DeclarationId(1913), -======= - ty: DeclarationId(1911), }, Field { label: "SomeDiagnostic".to_string(), - ty: DeclarationId(1912), ->>>>>>> origin/main + ty: DeclarationId(1914), }, ], }, @@ -24806,19 +22926,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DimensionOk".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1916), - }, - Field { - label: "DimensionFail".to_string(), - ty: DeclarationId(1920), -======= - ty: DeclarationId(1915), + ty: DeclarationId(1917), }, Field { label: "DimensionFail".to_string(), - ty: DeclarationId(1919), ->>>>>>> origin/main + ty: DeclarationId(1921), }, ], }, @@ -24857,19 +22969,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witness_of".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1922), - }, - Field { - label: "compose".to_string(), ty: DeclarationId(1923), -======= - ty: DeclarationId(1921), ->>>>>>> origin/main }, Field { label: "compose".to_string(), - ty: DeclarationId(1922), + ty: DeclarationId(1924), }, Field { label: "identity".to_string(), @@ -24877,11 +22981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "break_diagnostic".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1924), -======= - ty: DeclarationId(1923), ->>>>>>> origin/main + ty: DeclarationId(1925), }, ], }, @@ -24920,13 +23020,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![DeclarationId(877), DeclarationId(878)], phantom_params: vec![PhantomParameter { -<<<<<<< HEAD - parameter: DeclarationId(876), - algebra: DeclarationId(1925), -======= parameter: DeclarationId(877), - algebra: DeclarationId(1924), ->>>>>>> origin/main + algebra: DeclarationId(1926), }], meta_tag: None, specialization_parent: None, @@ -25067,19 +23162,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("add_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ -<<<<<<< HEAD - DeclarationId(1896), DeclarationId(1897), DeclarationId(1898), + DeclarationId(1899), ], - output: DeclarationId(1899), -======= - DeclarationId(1895), - DeclarationId(1896), - DeclarationId(1897), - ], - output: DeclarationId(1898), ->>>>>>> origin/main + output: DeclarationId(1900), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4316, 4338)), }, type_params: vec![DeclarationId(887), DeclarationId(888)], @@ -25108,23 +23195,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(888), -<<<<<<< HEAD - name: Some("sub_dimension".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![ - DeclarationId(1900), - DeclarationId(1901), - DeclarationId(1902), - ], - output: DeclarationId(1903), - body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4512, 4534)), - }, - type_params: vec![DeclarationId(889), DeclarationId(890)], -======= name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], ->>>>>>> origin/main phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -25139,11 +23212,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("sub_dimension".to_string()), connective: TypeConnective::Arrow { inputs: vec![ - DeclarationId(1899), - DeclarationId(1900), DeclarationId(1901), + DeclarationId(1902), + DeclarationId(1903), ], - output: DeclarationId(1902), + output: DeclarationId(1904), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4512, 4534)), }, type_params: vec![DeclarationId(890), DeclarationId(891)], @@ -25172,19 +23245,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }); declarations.push(Declaration { id: DeclarationId(891), -<<<<<<< HEAD - name: Some("mul_dimension_scalar".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1904), DeclarationId(1905), DeclarationId(893)], - output: DeclarationId(1906), - body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4700, 4729)), - }, - type_params: vec![DeclarationId(892), DeclarationId(893)], -======= name: None, connective: TypeConnective::Atom(AtomPayload::TypeParam("Carrier".to_string())), type_params: vec![], ->>>>>>> origin/main phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -25198,8 +23261,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(892), name: Some("mul_dimension_scalar".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1903), DeclarationId(1904), DeclarationId(894)], - output: DeclarationId(1905), + inputs: vec![DeclarationId(1905), DeclarationId(1906), DeclarationId(894)], + output: DeclarationId(1907), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4700, 4729)), }, type_params: vec![DeclarationId(893), DeclarationId(894)], @@ -25244,13 +23307,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(895), name: Some("div_dimension_scalar".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1907), DeclarationId(1908), DeclarationId(896)], - output: DeclarationId(1909), -======= - inputs: vec![DeclarationId(1906), DeclarationId(1907), DeclarationId(897)], - output: DeclarationId(1908), ->>>>>>> origin/main + inputs: vec![DeclarationId(1908), DeclarationId(1909), DeclarationId(897)], + output: DeclarationId(1910), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4895, 4924)), }, type_params: vec![DeclarationId(896), DeclarationId(897)], @@ -25298,19 +23356,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "target".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "target".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "carrier".to_string(), @@ -25322,11 +23372,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1926), -======= - ty: DeclarationId(1925), ->>>>>>> origin/main + ty: DeclarationId(1927), }, Field { label: "cost".to_string(), @@ -25351,27 +23397,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "kernel_integer".to_string(), - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "algebra".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "kernel_integer".to_string(), - ty: DeclarationId(1085), - }, - Field { - label: "algebra".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "bound".to_string(), @@ -25379,11 +23413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_realization".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -25404,19 +23434,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BoundUnspecified".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1927), - }, - Field { - label: "StaticBoundFact".to_string(), ty: DeclarationId(1928), -======= - ty: DeclarationId(1926), }, Field { label: "StaticBoundFact".to_string(), - ty: DeclarationId(1927), ->>>>>>> origin/main + ty: DeclarationId(1929), }, ], }, @@ -25466,19 +23488,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectField".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1929), - }, - Field { - label: "AccessorMethod".to_string(), ty: DeclarationId(1930), -======= - ty: DeclarationId(1928), }, Field { label: "AccessorMethod".to_string(), - ty: DeclarationId(1929), ->>>>>>> origin/main + ty: DeclarationId(1931), }, ], }, @@ -25499,27 +23513,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "target".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "op".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "target".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "op".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "carrier".to_string(), @@ -25548,19 +23550,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "target".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "target".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "carrier".to_string(), @@ -25589,19 +23583,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "target".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "target".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "strategy".to_string(), @@ -25609,11 +23595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "parameters".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1931), -======= - ty: DeclarationId(1930), ->>>>>>> origin/main + ty: DeclarationId(1932), }, Field { label: "cost".to_string(), @@ -25663,19 +23645,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrowed".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1932), - }, - Field { - label: "Consumed".to_string(), ty: DeclarationId(1933), -======= - ty: DeclarationId(1931), }, Field { label: "Consumed".to_string(), - ty: DeclarationId(1932), ->>>>>>> origin/main + ty: DeclarationId(1934), }, ], }, @@ -25696,19 +23670,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Owned".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1934), - }, - Field { - label: "Borrowed".to_string(), ty: DeclarationId(1935), -======= - ty: DeclarationId(1933), }, Field { label: "Borrowed".to_string(), - ty: DeclarationId(1934), ->>>>>>> origin/main + ty: DeclarationId(1936), }, ], }, @@ -25729,19 +23695,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SelfContained".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1936), - }, - Field { - label: "Caller".to_string(), ty: DeclarationId(1937), -======= - ty: DeclarationId(1935), }, Field { label: "Caller".to_string(), - ty: DeclarationId(1936), ->>>>>>> origin/main + ty: DeclarationId(1938), }, ], }, @@ -25762,27 +23720,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Growable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1938), - }, - Field { - label: "Fixed".to_string(), ty: DeclarationId(1939), }, - Field { - label: "NotApplicable".to_string(), - ty: DeclarationId(1940), -======= - ty: DeclarationId(1937), - }, Field { label: "Fixed".to_string(), - ty: DeclarationId(1938), ->>>>>>> origin/main + ty: DeclarationId(1940), }, Field { label: "NotApplicable".to_string(), - ty: DeclarationId(1939), + ty: DeclarationId(1941), }, ], }, @@ -25802,11 +23748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![Field { label: "Utf8FreeMonoidChar".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1941), -======= - ty: DeclarationId(1940), ->>>>>>> origin/main + ty: DeclarationId(1942), }], }, type_params: vec![], @@ -25826,19 +23768,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "target".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "target".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "carrier".to_string(), @@ -25867,83 +23801,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ListEmpty".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1942), - }, - Field { - label: "ListSingleton".to_string(), ty: DeclarationId(1943), }, - Field { - label: "ListCons".to_string(), - ty: DeclarationId(1944), - }, - Field { - label: "ListConcat".to_string(), - ty: DeclarationId(1945), - }, - Field { - label: "ListLength".to_string(), - ty: DeclarationId(1946), - }, - Field { - label: "ListIsEmpty".to_string(), - ty: DeclarationId(1947), - }, - Field { - label: "ListFold".to_string(), - ty: DeclarationId(1948), - }, - Field { - label: "ListMap".to_string(), - ty: DeclarationId(1949), - }, - Field { - label: "ListFilter".to_string(), - ty: DeclarationId(1950), - }, - Field { - label: "ListContains".to_string(), - ty: DeclarationId(1951), -======= - ty: DeclarationId(1941), - }, Field { label: "ListSingleton".to_string(), - ty: DeclarationId(1942), + ty: DeclarationId(1944), }, Field { label: "ListCons".to_string(), - ty: DeclarationId(1943), + ty: DeclarationId(1945), }, Field { label: "ListConcat".to_string(), - ty: DeclarationId(1944), + ty: DeclarationId(1946), }, Field { label: "ListLength".to_string(), - ty: DeclarationId(1945), + ty: DeclarationId(1947), }, Field { label: "ListIsEmpty".to_string(), - ty: DeclarationId(1946), + ty: DeclarationId(1948), }, Field { label: "ListFold".to_string(), - ty: DeclarationId(1947), + ty: DeclarationId(1949), }, Field { label: "ListMap".to_string(), - ty: DeclarationId(1948), + ty: DeclarationId(1950), }, Field { label: "ListFilter".to_string(), - ty: DeclarationId(1949), + ty: DeclarationId(1951), }, Field { label: "ListContains".to_string(), - ty: DeclarationId(1950), ->>>>>>> origin/main + ty: DeclarationId(1952), }, ], }, @@ -25964,19 +23858,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "language".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "target".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "target".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "strategy".to_string(), @@ -25984,19 +23870,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "empty_variant".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "cons_variant".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "cons_variant".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, Field { label: "scrutinee".to_string(), @@ -26041,19 +23919,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PlaceholderPatternStrategy".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1952), - }, - Field { - label: "VectorList".to_string(), ty: DeclarationId(1953), -======= - ty: DeclarationId(1951), }, Field { label: "VectorList".to_string(), - ty: DeclarationId(1952), ->>>>>>> origin/main + ty: DeclarationId(1954), }, ], }, @@ -26516,19 +24386,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Borrow".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1954), - }, - Field { - label: "PassByValue".to_string(), ty: DeclarationId(1955), -======= - ty: DeclarationId(1953), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(1954), ->>>>>>> origin/main + ty: DeclarationId(1956), }, ], }, @@ -26549,19 +24411,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "CopyOrClone".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1956), - }, - Field { - label: "PassByValue".to_string(), ty: DeclarationId(1957), -======= - ty: DeclarationId(1955), }, Field { label: "PassByValue".to_string(), - ty: DeclarationId(1956), ->>>>>>> origin/main + ty: DeclarationId(1958), }, ], }, @@ -26582,99 +24436,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "statements".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "expressions".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "control_flow".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "literals".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "modules".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "functions".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "type_applications".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "type_definitions".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "record_derive_templates".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "patterns".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "collection_ops".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "values".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "expressions".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "control_flow".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "literals".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "modules".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "functions".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "type_applications".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "type_definitions".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "record_derive_templates".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "patterns".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "collection_ops".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "values".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -26695,19 +24501,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IndexedArgs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1958), - }, - Field { - label: "NamedArg".to_string(), ty: DeclarationId(1959), -======= - ty: DeclarationId(1957), }, Field { label: "NamedArg".to_string(), - ty: DeclarationId(1958), ->>>>>>> origin/main + ty: DeclarationId(1960), }, ], }, @@ -26728,19 +24526,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "SingleTemplate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1960), - }, - Field { - label: "HigherOrderTemplates".to_string(), ty: DeclarationId(1961), -======= - ty: DeclarationId(1959), }, Field { label: "HigherOrderTemplates".to_string(), - ty: DeclarationId(1960), ->>>>>>> origin/main + ty: DeclarationId(1962), }, ], }, @@ -26924,11 +24714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1962)), -======= - meta_tag: Some(DeclarationId(1961)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1963)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -26947,11 +24733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -26964,11 +24746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -26990,11 +24768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -27007,11 +24781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27033,11 +24803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -27050,11 +24816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27076,11 +24838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg}...)".to_string(), ))], @@ -27093,11 +24851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27119,11 +24873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Map({recv}, {arg})".to_string(), ))], @@ -27136,11 +24886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27162,11 +24908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -27179,11 +24921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27205,11 +24943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -27222,11 +24956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27248,11 +24978,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -27265,11 +24991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27291,11 +25013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -27308,11 +25026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27332,11 +25046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -27349,11 +25059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27373,11 +25079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -27390,11 +25092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27416,11 +25114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Fold({recv}, {arg})".to_string(), ))], @@ -27433,11 +25127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27459,11 +25149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -27476,11 +25162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27502,11 +25184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -27519,11 +25197,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -27540,43 +25214,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "DirectRecursion".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1972), - }, - Field { - label: "ListRecursion".to_string(), ty: DeclarationId(1973), }, - Field { - label: "OptionalRecursion".to_string(), - ty: DeclarationId(1974), - }, - Field { - label: "SetRecursion".to_string(), - ty: DeclarationId(1975), - }, - Field { - label: "MapValueRecursion".to_string(), - ty: DeclarationId(1976), -======= - ty: DeclarationId(1971), - }, Field { label: "ListRecursion".to_string(), - ty: DeclarationId(1972), + ty: DeclarationId(1974), }, Field { label: "OptionalRecursion".to_string(), - ty: DeclarationId(1973), + ty: DeclarationId(1975), }, Field { label: "SetRecursion".to_string(), - ty: DeclarationId(1974), + ty: DeclarationId(1976), }, Field { label: "MapValueRecursion".to_string(), - ty: DeclarationId(1975), ->>>>>>> origin/main + ty: DeclarationId(1977), }, ], }, @@ -27667,13 +25321,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(944), name: Some("inductive_field_to_dimension".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(940), DeclarationId(197)], - output: DeclarationId(1040), -======= inputs: vec![DeclarationId(941), DeclarationId(197)], - output: DeclarationId(1039), ->>>>>>> origin/main + output: DeclarationId(1041), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)), }, type_params: vec![], @@ -27693,43 +25342,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StrictSubValue".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1977), - }, - Field { - label: "IteratedSubValue".to_string(), ty: DeclarationId(1978), }, - Field { - label: "ArithmeticDescent".to_string(), - ty: DeclarationId(1979), - }, - Field { - label: "PreservedValue".to_string(), - ty: DeclarationId(1980), - }, - Field { - label: "SubValueUnknown".to_string(), - ty: DeclarationId(1981), -======= - ty: DeclarationId(1976), - }, Field { label: "IteratedSubValue".to_string(), - ty: DeclarationId(1977), + ty: DeclarationId(1979), }, Field { label: "ArithmeticDescent".to_string(), - ty: DeclarationId(1978), + ty: DeclarationId(1980), }, Field { label: "PreservedValue".to_string(), - ty: DeclarationId(1979), + ty: DeclarationId(1981), }, Field { label: "SubValueUnknown".to_string(), - ty: DeclarationId(1980), ->>>>>>> origin/main + ty: DeclarationId(1982), }, ], }, @@ -27747,13 +25376,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(946), name: Some("sub_value_to_evidence".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(944)], - output: DeclarationId(1033), -======= inputs: vec![DeclarationId(945)], - output: DeclarationId(1032), ->>>>>>> origin/main + output: DeclarationId(1034), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 11067, @@ -27884,13 +25508,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(952), name: Some("sub_value_to_call_pattern".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(944)], - output: DeclarationId(1963), -======= inputs: vec![DeclarationId(945)], - output: DeclarationId(1962), ->>>>>>> origin/main + output: DeclarationId(1964), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20518, @@ -27911,13 +25530,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(953), name: Some("sub_value_to_lowering_target".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(944)], - output: DeclarationId(1964), -======= inputs: vec![DeclarationId(945)], - output: DeclarationId(1963), ->>>>>>> origin/main + output: DeclarationId(1965), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21906, @@ -27941,35 +25555,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IntegerExpZero".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1982), - }, - Field { - label: "IntegerExpPos".to_string(), ty: DeclarationId(1983), }, - Field { - label: "FractionExp".to_string(), - ty: DeclarationId(1984), - }, - Field { - label: "LogBasedExp".to_string(), - ty: DeclarationId(1985), -======= - ty: DeclarationId(1981), - }, Field { label: "IntegerExpPos".to_string(), - ty: DeclarationId(1982), + ty: DeclarationId(1984), }, Field { label: "FractionExp".to_string(), - ty: DeclarationId(1983), + ty: DeclarationId(1985), }, Field { label: "LogBasedExp".to_string(), - ty: DeclarationId(1984), ->>>>>>> origin/main + ty: DeclarationId(1986), }, ], }, @@ -28012,19 +25610,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PolyCost".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1986), - }, - Field { - label: "LogCost".to_string(), ty: DeclarationId(1987), -======= - ty: DeclarationId(1985), }, Field { label: "LogCost".to_string(), - ty: DeclarationId(1986), ->>>>>>> origin/main + ty: DeclarationId(1988), }, ], }, @@ -28045,59 +25635,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ConstantBound".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1988), - }, - Field { - label: "AtomicBound".to_string(), ty: DeclarationId(1989), }, - Field { - label: "ProductBound".to_string(), - ty: DeclarationId(1991), - }, - Field { - label: "SumOfProductsBound".to_string(), - ty: DeclarationId(1994), - }, - Field { - label: "SumBound".to_string(), - ty: DeclarationId(1996), - }, - Field { - label: "ForeverBound".to_string(), - ty: DeclarationId(1997), - }, - Field { - label: "ErrorBound".to_string(), - ty: DeclarationId(1998), -======= - ty: DeclarationId(1987), - }, Field { label: "AtomicBound".to_string(), - ty: DeclarationId(1988), + ty: DeclarationId(1990), }, Field { label: "ProductBound".to_string(), - ty: DeclarationId(1990), + ty: DeclarationId(1992), }, Field { label: "SumOfProductsBound".to_string(), - ty: DeclarationId(1993), + ty: DeclarationId(1995), }, Field { label: "SumBound".to_string(), - ty: DeclarationId(1995), + ty: DeclarationId(1997), }, Field { label: "ForeverBound".to_string(), - ty: DeclarationId(1996), ->>>>>>> origin/main + ty: DeclarationId(1998), }, Field { label: "ErrorBound".to_string(), - ty: DeclarationId(1997), + ty: DeclarationId(1999), }, ], }, @@ -28115,13 +25677,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(958), name: Some("sum_bound".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(1965)], - output: DeclarationId(956), -======= - inputs: vec![DeclarationId(1964)], + inputs: vec![DeclarationId(1966)], output: DeclarationId(957), ->>>>>>> origin/main body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 27827, @@ -28396,11 +25953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_add_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], -<<<<<<< HEAD - output: DeclarationId(1966), -======= - output: DeclarationId(1965), ->>>>>>> origin/main + output: DeclarationId(1967), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31955, @@ -28422,11 +25975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_mul_checked".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], -<<<<<<< HEAD - output: DeclarationId(1967), -======= - output: DeclarationId(1966), ->>>>>>> origin/main + output: DeclarationId(1968), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 32251, @@ -28448,11 +25997,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("bounded_int_pow_exponent".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], -<<<<<<< HEAD - output: DeclarationId(1968), -======= - output: DeclarationId(1967), ->>>>>>> origin/main + output: DeclarationId(1969), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33500, @@ -28474,11 +26019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("int_pow_bounded".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], -<<<<<<< HEAD - output: DeclarationId(1969), -======= - output: DeclarationId(1968), ->>>>>>> origin/main + output: DeclarationId(1970), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33975, @@ -28500,11 +26041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("ceil_log".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81), DeclarationId(81)], -<<<<<<< HEAD - output: DeclarationId(1970), -======= - output: DeclarationId(1969), ->>>>>>> origin/main + output: DeclarationId(1971), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35238, @@ -28531,11 +26068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(81), DeclarationId(81), ], -<<<<<<< HEAD - output: DeclarationId(1971), -======= - output: DeclarationId(1970), ->>>>>>> origin/main + output: DeclarationId(1972), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35510, @@ -28938,20 +26471,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1086), -======= - value: DeclarationId(1085), ->>>>>>> origin/main + value: DeclarationId(1087), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1999)), -======= - meta_tag: Some(DeclarationId(1998)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(2000)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -28972,20 +26497,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1086), -======= - value: DeclarationId(1085), ->>>>>>> origin/main + value: DeclarationId(1087), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2000)), -======= - meta_tag: Some(DeclarationId(1999)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(2001)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -29010,43 +26527,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "read".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2002), - }, - Field { - label: "sequential".to_string(), ty: DeclarationId(2003), }, - Field { - label: "branch".to_string(), - ty: DeclarationId(2004), - }, - Field { - label: "iterate".to_string(), - ty: DeclarationId(2005), - }, - Field { - label: "validate".to_string(), - ty: DeclarationId(2006), -======= - ty: DeclarationId(2001), - }, Field { label: "sequential".to_string(), - ty: DeclarationId(2002), + ty: DeclarationId(2004), }, Field { label: "branch".to_string(), - ty: DeclarationId(2003), + ty: DeclarationId(2005), }, Field { label: "iterate".to_string(), - ty: DeclarationId(2004), + ty: DeclarationId(2006), }, Field { label: "validate".to_string(), - ty: DeclarationId(2005), ->>>>>>> origin/main + ty: DeclarationId(2007), }, ], }, @@ -29081,19 +26578,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Miss".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2009), - }, - Field { - label: "Hit".to_string(), ty: DeclarationId(2010), -======= - ty: DeclarationId(2008), }, Field { label: "Hit".to_string(), - ty: DeclarationId(2009), ->>>>>>> origin/main + ty: DeclarationId(2011), }, ], }, @@ -29126,11 +26615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("miss_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![], -<<<<<<< HEAD - output: DeclarationId(2007), -======= - output: DeclarationId(2006), ->>>>>>> origin/main + output: DeclarationId(2008), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)), }, type_params: vec![], @@ -29148,11 +26633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: Some("hit_int_lookup".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], -<<<<<<< HEAD - output: DeclarationId(2008), -======= - output: DeclarationId(2007), ->>>>>>> origin/main + output: DeclarationId(2009), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)), }, type_params: vec![], @@ -29190,11 +26671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "items".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2011), -======= - ty: DeclarationId(2010), ->>>>>>> origin/main + ty: DeclarationId(2012), }], }, type_params: vec![], @@ -29222,11 +26699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2012), -======= - ty: DeclarationId(2011), ->>>>>>> origin/main + ty: DeclarationId(2013), }, ], }, @@ -29301,19 +26774,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Positional".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2014), - }, - Field { - label: "Record".to_string(), - ty: DeclarationId(2016), -======= - ty: DeclarationId(2013), + ty: DeclarationId(2015), }, Field { label: "Record".to_string(), - ty: DeclarationId(2015), ->>>>>>> origin/main + ty: DeclarationId(2017), }, ], }, @@ -29334,35 +26799,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Named".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2017), + ty: DeclarationId(2018), }, Field { label: "Parameterized".to_string(), - ty: DeclarationId(2019), - }, - Field { - label: "Optional".to_string(), ty: DeclarationId(2020), -======= - ty: DeclarationId(2016), - }, - Field { - label: "Parameterized".to_string(), - ty: DeclarationId(2018), ->>>>>>> origin/main }, Field { label: "Optional".to_string(), - ty: DeclarationId(2019), + ty: DeclarationId(2021), }, Field { label: "Arrow".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2022), -======= - ty: DeclarationId(2021), ->>>>>>> origin/main + ty: DeclarationId(2023), }, ], }, @@ -29503,27 +26952,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BareVariant".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2023), - }, - Field { - label: "VariantWith".to_string(), ty: DeclarationId(2024), -======= - ty: DeclarationId(2022), ->>>>>>> origin/main }, Field { label: "VariantWith".to_string(), - ty: DeclarationId(2023), + ty: DeclarationId(2025), }, Field { label: "VariantFields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2026), -======= - ty: DeclarationId(2025), ->>>>>>> origin/main + ty: DeclarationId(2027), }, ], }, @@ -29544,27 +26981,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Int".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2027), - }, - Field { - label: "Bool".to_string(), ty: DeclarationId(2028), }, - Field { - label: "String".to_string(), - ty: DeclarationId(2029), -======= - ty: DeclarationId(2026), - }, Field { label: "Bool".to_string(), - ty: DeclarationId(2027), ->>>>>>> origin/main + ty: DeclarationId(2029), }, Field { label: "String".to_string(), - ty: DeclarationId(2028), + ty: DeclarationId(2030), }, ], }, @@ -29585,99 +27010,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Literal".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2030), - }, - Field { - label: "Var".to_string(), ty: DeclarationId(2031), -======= - ty: DeclarationId(2029), ->>>>>>> origin/main }, Field { label: "Var".to_string(), - ty: DeclarationId(2030), + ty: DeclarationId(2032), }, Field { label: "Path".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2034), + ty: DeclarationId(2035), }, Field { label: "Call".to_string(), - ty: DeclarationId(2036), + ty: DeclarationId(2037), }, Field { label: "VariantRecord".to_string(), - ty: DeclarationId(2038), + ty: DeclarationId(2039), }, Field { label: "Operator".to_string(), - ty: DeclarationId(2040), + ty: DeclarationId(2041), }, Field { label: "Lambda".to_string(), - ty: DeclarationId(2042), - }, - Field { - label: "If".to_string(), ty: DeclarationId(2043), }, - Field { - label: "Match".to_string(), - ty: DeclarationId(2045), - }, - Field { - label: "Record".to_string(), - ty: DeclarationId(2047), - }, - Field { - label: "List".to_string(), - ty: DeclarationId(2049), -======= - ty: DeclarationId(2033), - }, - Field { - label: "Call".to_string(), - ty: DeclarationId(2035), - }, - Field { - label: "VariantRecord".to_string(), - ty: DeclarationId(2037), - }, - Field { - label: "Operator".to_string(), - ty: DeclarationId(2039), - }, - Field { - label: "Lambda".to_string(), - ty: DeclarationId(2041), - }, Field { label: "If".to_string(), - ty: DeclarationId(2042), - }, - Field { - label: "Match".to_string(), ty: DeclarationId(2044), }, Field { - label: "Record".to_string(), + label: "Match".to_string(), ty: DeclarationId(2046), }, Field { - label: "List".to_string(), + label: "Record".to_string(), ty: DeclarationId(2048), }, Field { - label: "Map".to_string(), + label: "List".to_string(), ty: DeclarationId(2050), ->>>>>>> origin/main }, Field { label: "Map".to_string(), - ty: DeclarationId(2051), + ty: DeclarationId(2052), }, ], }, @@ -29698,83 +27075,43 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Let".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2053), - }, - Field { - label: "Fn".to_string(), - ty: DeclarationId(2056), - }, - Field { - label: "FnExternalBody".to_string(), - ty: DeclarationId(2059), - }, - Field { - label: "Data".to_string(), - ty: DeclarationId(2061), - }, - Field { - label: "Module".to_string(), - ty: DeclarationId(2063), - }, - Field { - label: "Import".to_string(), - ty: DeclarationId(2066), -======= - ty: DeclarationId(2052), + ty: DeclarationId(2054), }, Field { label: "Fn".to_string(), - ty: DeclarationId(2055), + ty: DeclarationId(2057), }, Field { label: "FnExternalBody".to_string(), - ty: DeclarationId(2058), + ty: DeclarationId(2060), }, Field { label: "Data".to_string(), - ty: DeclarationId(2060), + ty: DeclarationId(2062), }, Field { label: "Module".to_string(), - ty: DeclarationId(2062), + ty: DeclarationId(2064), }, Field { label: "Import".to_string(), - ty: DeclarationId(2065), - }, - Field { - label: "TypeAtom".to_string(), ty: DeclarationId(2067), ->>>>>>> origin/main }, Field { label: "TypeAtom".to_string(), - ty: DeclarationId(2068), + ty: DeclarationId(2069), }, Field { label: "TypeRecord".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2071), - }, - Field { - label: "TypeSum".to_string(), - ty: DeclarationId(2075), - }, - Field { - label: "TypeAlias".to_string(), - ty: DeclarationId(2078), -======= - ty: DeclarationId(2070), + ty: DeclarationId(2072), }, Field { label: "TypeSum".to_string(), - ty: DeclarationId(2074), + ty: DeclarationId(2076), }, Field { label: "TypeAlias".to_string(), - ty: DeclarationId(2077), ->>>>>>> origin/main + ty: DeclarationId(2079), }, ], }, @@ -29800,11 +27137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2079)), -======= - meta_tag: Some(DeclarationId(2078)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(2080)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -29823,11 +27156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -29840,11 +27169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -29864,11 +27189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -29881,11 +27202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -29905,11 +27222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -29922,11 +27235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -29948,11 +27257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -29965,11 +27270,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -29991,11 +27292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -30008,11 +27305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30034,11 +27327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -30051,11 +27340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30077,11 +27362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -30094,11 +27375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30118,11 +27395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + {arg}".to_string(), ))], @@ -30135,11 +27408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30161,11 +27430,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "[{arg}(x) for x in {recv}]".to_string(), ))], @@ -30178,11 +27443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30204,11 +27465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -30221,11 +27478,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30247,11 +27500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -30264,11 +27513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30290,11 +27535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -30307,11 +27548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30333,11 +27570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -30350,11 +27583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30374,11 +27603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -30391,11 +27616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30415,11 +27636,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -30432,11 +27649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30458,11 +27671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "functools.reduce({arg}, {recv})".to_string(), ))], @@ -30475,11 +27684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30501,11 +27706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -30518,11 +27719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30542,11 +27739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "emit_template".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1960), -======= - constructor: DeclarationId(1959), ->>>>>>> origin/main + constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -30559,11 +27752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "placeholder_convention".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1959), -======= - constructor: DeclarationId(1958), ->>>>>>> origin/main + constructor: DeclarationId(1960), payload: vec![], }, ), @@ -30616,11 +27805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "target".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }], }, type_params: vec![], @@ -30665,43 +27850,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "LiteralValue".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2080), + ty: DeclarationId(2081), }, Field { label: "RecordValue".to_string(), - ty: DeclarationId(2082), - }, - Field { - label: "VariantValue".to_string(), ty: DeclarationId(2083), }, - Field { - label: "NodeRef".to_string(), - ty: DeclarationId(2084), - }, - Field { - label: "CardinalityValue".to_string(), - ty: DeclarationId(2085), -======= - ty: DeclarationId(2079), - }, - Field { - label: "RecordValue".to_string(), - ty: DeclarationId(2081), - }, Field { label: "VariantValue".to_string(), - ty: DeclarationId(2082), + ty: DeclarationId(2084), }, Field { label: "NodeRef".to_string(), - ty: DeclarationId(2083), + ty: DeclarationId(2085), }, Field { label: "CardinalityValue".to_string(), - ty: DeclarationId(2084), ->>>>>>> origin/main + ty: DeclarationId(2086), }, ], }, @@ -30754,11 +27919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "bindings".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2086), -======= - ty: DeclarationId(2085), ->>>>>>> origin/main + ty: DeclarationId(2087), }], }, type_params: vec![], @@ -30777,49 +27938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "frames".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2087), -======= - ty: DeclarationId(2086), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 4548, 4597), - }); - declarations.push(Declaration { - id: DeclarationId(1025), - name: Some("EvalStrategy".to_string()), - connective: TypeConnective::Disj { - variants: vec![Field { - label: "ApplicativeOrder".to_string(), - ty: DeclarationId(2087), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/runtime.dag", 5002, 5076), - }); - declarations.push(Declaration { - id: DeclarationId(1026), - name: Some("InputEvaluationOrder".to_string()), - connective: TypeConnective::Disj { - variants: vec![Field { - label: "LeftFirst".to_string(), ty: DeclarationId(2088), ->>>>>>> origin/main }], }, type_params: vec![], @@ -30833,12 +27952,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4505, 4554), }); declarations.push(Declaration { - id: DeclarationId(1024), + id: DeclarationId(1025), name: Some("EvalStateKey".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "state".to_string(), - ty: DeclarationId(1023), + ty: DeclarationId(1024), }], }, type_params: vec![], @@ -30852,12 +27971,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4935, 4980), }); declarations.push(Declaration { - id: DeclarationId(1025), + id: DeclarationId(1026), name: Some("EvalStrategy".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "ApplicativeOrder".to_string(), - ty: DeclarationId(2088), + ty: DeclarationId(2089), }], }, type_params: vec![], @@ -30871,12 +27990,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5385, 5459), }); declarations.push(Declaration { - id: DeclarationId(1026), + id: DeclarationId(1027), name: Some("InputEvaluationOrder".to_string()), connective: TypeConnective::Disj { variants: vec![Field { label: "LeftFirst".to_string(), - ty: DeclarationId(2089), + ty: DeclarationId(2090), }], }, type_params: vec![], @@ -30889,9 +28008,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/runtime.dag", 5696, 5733), }); -<<<<<<< HEAD declarations.push(Declaration { - id: DeclarationId(1027), + id: DeclarationId(1028), name: Some("EvalMemoKey".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -30905,11 +28023,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "state_key".to_string(), - ty: DeclarationId(1024), + ty: DeclarationId(1025), }, Field { label: "strategy".to_string(), - ty: DeclarationId(1025), + ty: DeclarationId(1026), }, ], }, @@ -30923,14 +28041,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/runtime.dag", 6042, 6153), }); - declarations.push(Declaration { id: DeclarationId(1028), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(934) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2090)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); + declarations.push(Declaration { id: DeclarationId(1029), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(935) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2091)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1962), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1962), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1962), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1962), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1961), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); declarations.push(Declaration { - id: DeclarationId(1029), -======= - declarations.push(Declaration { id: DeclarationId(1027), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(935) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2089)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1960), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1959), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1958), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); - declarations.push(Declaration { - id: DeclarationId(1028), ->>>>>>> origin/main + id: DeclarationId(1030), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -30944,11 +28057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 3686, 3704), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1030), -======= - id: DeclarationId(1029), ->>>>>>> origin/main + id: DeclarationId(1031), name: Some("RestEndpointBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -30973,20 +28082,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 4653, 4725), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1031), -======= - id: DeclarationId(1030), ->>>>>>> origin/main + id: DeclarationId(1032), name: Some("CallableRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }], }, type_params: vec![], @@ -31000,37 +28101,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 5533, 5576), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1032), -======= - id: DeclarationId(1031), ->>>>>>> origin/main + id: DeclarationId(1033), name: Some("Operation".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "callable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1031), - }, - Field { - label: "inputs".to_string(), - ty: DeclarationId(2091), - }, - Field { - label: "endpoint".to_string(), - ty: DeclarationId(1030), -======= - ty: DeclarationId(1030), + ty: DeclarationId(1032), }, Field { label: "inputs".to_string(), - ty: DeclarationId(2090), + ty: DeclarationId(2092), }, Field { label: "endpoint".to_string(), - ty: DeclarationId(1029), ->>>>>>> origin/main + ty: DeclarationId(1031), }, ], }, @@ -31045,37 +28130,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6785, 6895), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1033), -======= - id: DeclarationId(1032), ->>>>>>> origin/main + id: DeclarationId(1034), name: Some("DescentEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Strict".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2099), - }, - Field { - label: "NonIncreasing".to_string(), ty: DeclarationId(2100), }, - Field { - label: "DescentUnknown".to_string(), - ty: DeclarationId(2101), -======= - ty: DeclarationId(2098), - }, Field { label: "NonIncreasing".to_string(), - ty: DeclarationId(2099), ->>>>>>> origin/main + ty: DeclarationId(2101), }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2100), + ty: DeclarationId(2102), }, ], }, @@ -31090,17 +28159,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 642, 710), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1034), - name: Some("evidence_rank".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1033)], -======= - id: DeclarationId(1033), + id: DeclarationId(1035), name: Some("evidence_rank".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1032)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1034)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)), }, @@ -31115,19 +28177,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 712, 838), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1035), - name: Some("merge_evidence".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1033), DeclarationId(1033)], - output: DeclarationId(1033), -======= - id: DeclarationId(1034), + id: DeclarationId(1036), name: Some("merge_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1032), DeclarationId(1032)], - output: DeclarationId(1032), ->>>>>>> origin/main + inputs: vec![DeclarationId(1034), DeclarationId(1034)], + output: DeclarationId(1034), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)), }, type_params: vec![], @@ -31141,19 +28195,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 905, 1310), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1036), - name: Some("join_evidence".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1033), DeclarationId(1033)], - output: DeclarationId(1033), -======= - id: DeclarationId(1035), + id: DeclarationId(1037), name: Some("join_evidence".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1032), DeclarationId(1032)], - output: DeclarationId(1032), ->>>>>>> origin/main + inputs: vec![DeclarationId(1034), DeclarationId(1034)], + output: DeclarationId(1034), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1456, @@ -31171,19 +28217,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 1380, 1655), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1037), - name: Some("promote_to_strict".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1033)], - output: DeclarationId(1033), -======= - id: DeclarationId(1036), + id: DeclarationId(1038), name: Some("promote_to_strict".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1032)], - output: DeclarationId(1032), ->>>>>>> origin/main + inputs: vec![DeclarationId(1034)], + output: DeclarationId(1034), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2117, @@ -31201,19 +28239,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2050, 2236), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1038), - name: Some("optional_evidence_meet".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2092), DeclarationId(2093)], - output: DeclarationId(2094), -======= - id: DeclarationId(1037), + id: DeclarationId(1039), name: Some("optional_evidence_meet".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2091), DeclarationId(2092)], - output: DeclarationId(2093), ->>>>>>> origin/main + inputs: vec![DeclarationId(2093), DeclarationId(2094)], + output: DeclarationId(2095), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2388, @@ -31231,19 +28261,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2300, 2564), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1039), - name: Some("map_evidence_merge_at".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2095), DeclarationId(197), DeclarationId(1033)], - output: DeclarationId(2096), -======= - id: DeclarationId(1038), + id: DeclarationId(1040), name: Some("map_evidence_merge_at".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2094), DeclarationId(197), DeclarationId(1032)], - output: DeclarationId(2095), ->>>>>>> origin/main + inputs: vec![DeclarationId(2096), DeclarationId(197), DeclarationId(1034)], + output: DeclarationId(2097), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2733, @@ -31261,53 +28283,29 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2601, 2907), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1040), -======= - id: DeclarationId(1039), ->>>>>>> origin/main + id: DeclarationId(1041), name: Some("RankingDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeSize".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2102), - }, - Field { - label: "ListLength".to_string(), ty: DeclarationId(2103), }, - Field { - label: "ArithmeticValue".to_string(), - ty: DeclarationId(2104), - }, - Field { - label: "TokenPosition".to_string(), - ty: DeclarationId(2105), - }, - Field { - label: "SetCardinality".to_string(), - ty: DeclarationId(2106), -======= - ty: DeclarationId(2101), - }, Field { label: "ListLength".to_string(), - ty: DeclarationId(2102), + ty: DeclarationId(2104), }, Field { label: "ArithmeticValue".to_string(), - ty: DeclarationId(2103), + ty: DeclarationId(2105), }, Field { label: "TokenPosition".to_string(), - ty: DeclarationId(2104), + ty: DeclarationId(2106), }, Field { label: "SetCardinality".to_string(), - ty: DeclarationId(2105), ->>>>>>> origin/main + ty: DeclarationId(2107), }, ], }, @@ -31322,29 +28320,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3206, 3402), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1041), -======= - id: DeclarationId(1040), ->>>>>>> origin/main + id: DeclarationId(1042), name: Some("PositiveDescentAmount".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OneStep".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2107), - }, - Field { - label: "AdditionalStep".to_string(), ty: DeclarationId(2108), -======= - ty: DeclarationId(2106), }, Field { label: "AdditionalStep".to_string(), - ty: DeclarationId(2107), ->>>>>>> origin/main + ty: DeclarationId(2109), }, ], }, @@ -31359,29 +28345,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4378, 4471), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1042), -======= - id: DeclarationId(1041), ->>>>>>> origin/main + id: DeclarationId(1043), name: Some("ProportionalDivisor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DivideByTwo".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2109), - }, - Field { - label: "StrictlyLarger".to_string(), ty: DeclarationId(2110), -======= - ty: DeclarationId(2108), }, Field { label: "StrictlyLarger".to_string(), - ty: DeclarationId(2109), ->>>>>>> origin/main + ty: DeclarationId(2111), }, ], }, @@ -31396,17 +28370,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4937, 5027), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1043), - name: Some("proportional_divisor_to_int".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1042)], -======= - id: DeclarationId(1042), + id: DeclarationId(1044), name: Some("proportional_divisor_to_int".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1041)], ->>>>>>> origin/main + inputs: vec![DeclarationId(1043)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -31425,11 +28392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5029, 5204), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1044), -======= - id: DeclarationId(1043), ->>>>>>> origin/main + id: DeclarationId(1045), name: Some("peano_literal_materialization_cap".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -31451,19 +28414,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5388, 5441), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1045), - name: Some("positive_descent_amount_from_positive_int".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(81)], - output: DeclarationId(2097), -======= - id: DeclarationId(1044), + id: DeclarationId(1046), name: Some("positive_descent_amount_from_positive_int".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(2096), ->>>>>>> origin/main + output: DeclarationId(2098), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 5902, @@ -31481,19 +28436,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 5823, 6262), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1046), - name: Some("proportional_divisor_from_int_at_least_two".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(81)], - output: DeclarationId(2098), -======= - id: DeclarationId(1045), + id: DeclarationId(1047), name: Some("proportional_divisor_from_int_at_least_two".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(81)], - output: DeclarationId(2097), ->>>>>>> origin/main + output: DeclarationId(2099), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6342, @@ -31511,69 +28458,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6264, 6703), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1047), -======= - id: DeclarationId(1046), ->>>>>>> origin/main + id: DeclarationId(1048), name: Some("DescentSource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2111), - }, - Field { - label: "ListShrink".to_string(), ty: DeclarationId(2112), }, - Field { - label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2113), - }, - Field { - label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2114), - }, - Field { - label: "ParserAdvance".to_string(), - ty: DeclarationId(2115), - }, - Field { - label: "SetRemoval".to_string(), - ty: DeclarationId(2116), - }, - Field { - label: "FoldIteration".to_string(), - ty: DeclarationId(2117), -======= - ty: DeclarationId(2110), - }, Field { label: "ListShrink".to_string(), - ty: DeclarationId(2111), + ty: DeclarationId(2113), }, Field { label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2112), + ty: DeclarationId(2114), }, Field { label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2113), + ty: DeclarationId(2115), }, Field { label: "ParserAdvance".to_string(), - ty: DeclarationId(2114), + ty: DeclarationId(2116), }, Field { label: "SetRemoval".to_string(), - ty: DeclarationId(2115), + ty: DeclarationId(2117), }, Field { label: "FoldIteration".to_string(), - ty: DeclarationId(2116), ->>>>>>> origin/main + ty: DeclarationId(2118), }, ], }, @@ -31588,20 +28503,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7108, 7429), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1048), -======= - id: DeclarationId(1047), ->>>>>>> origin/main + id: DeclarationId(1049), name: Some("TerminationProof".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "dimensions".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2118), -======= - ty: DeclarationId(2117), ->>>>>>> origin/main + ty: DeclarationId(2119), }], }, type_params: vec![], @@ -31615,11 +28522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7431, 7493), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1049), -======= - id: DeclarationId(1048), ->>>>>>> origin/main + id: DeclarationId(1050), name: Some("ProofEdge".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -31633,11 +28536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "evidence".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2119), -======= - ty: DeclarationId(2118), ->>>>>>> origin/main + ty: DeclarationId(2120), }, ], }, @@ -31652,381 +28551,193 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7638, 7724), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1050), -======= - id: DeclarationId(1049), ->>>>>>> origin/main + id: DeclarationId(1051), name: Some("TokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2120), - }, - Field { - label: "KwIf".to_string(), ty: DeclarationId(2121), }, - Field { - label: "KwThen".to_string(), - ty: DeclarationId(2122), - }, - Field { - label: "KwElse".to_string(), - ty: DeclarationId(2123), - }, - Field { - label: "KwFn".to_string(), - ty: DeclarationId(2124), - }, - Field { - label: "KwType".to_string(), - ty: DeclarationId(2125), - }, - Field { - label: "KwService".to_string(), - ty: DeclarationId(2126), - }, - Field { - label: "KwModule".to_string(), - ty: DeclarationId(2127), - }, - Field { - label: "KwImport".to_string(), - ty: DeclarationId(2128), - }, - Field { - label: "KwMatch".to_string(), - ty: DeclarationId(2129), - }, - Field { - label: "KwData".to_string(), - ty: DeclarationId(2130), - }, - Field { - label: "KwWhere".to_string(), - ty: DeclarationId(2131), - }, - Field { - label: "KwTrue".to_string(), - ty: DeclarationId(2132), - }, - Field { - label: "KwFalse".to_string(), - ty: DeclarationId(2133), - }, - Field { - label: "Ident".to_string(), - ty: DeclarationId(2134), - }, - Field { - label: "IntLit".to_string(), - ty: DeclarationId(2135), - }, - Field { - label: "StringLit".to_string(), - ty: DeclarationId(2136), - }, - Field { - label: "Eq".to_string(), - ty: DeclarationId(2137), - }, - Field { - label: "EqEq".to_string(), - ty: DeclarationId(2138), - }, - Field { - label: "NotEq".to_string(), - ty: DeclarationId(2139), - }, - Field { - label: "Lt".to_string(), - ty: DeclarationId(2140), - }, - Field { - label: "Le".to_string(), - ty: DeclarationId(2141), - }, - Field { - label: "Gt".to_string(), - ty: DeclarationId(2142), - }, - Field { - label: "Ge".to_string(), - ty: DeclarationId(2143), - }, - Field { - label: "Plus".to_string(), - ty: DeclarationId(2144), - }, - Field { - label: "Minus".to_string(), - ty: DeclarationId(2145), - }, - Field { - label: "Star".to_string(), - ty: DeclarationId(2146), - }, - Field { - label: "Slash".to_string(), - ty: DeclarationId(2147), - }, - Field { - label: "AmpAmp".to_string(), - ty: DeclarationId(2148), - }, - Field { - label: "PipePipe".to_string(), - ty: DeclarationId(2149), - }, - Field { - label: "Colon".to_string(), - ty: DeclarationId(2150), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(2151), - }, - Field { - label: "FatArrow".to_string(), - ty: DeclarationId(2152), - }, - Field { - label: "PipeArrow".to_string(), - ty: DeclarationId(2153), - }, - Field { - label: "Dot".to_string(), - ty: DeclarationId(2154), - }, - Field { - label: "LParen".to_string(), - ty: DeclarationId(2155), - }, - Field { - label: "RParen".to_string(), - ty: DeclarationId(2156), - }, - Field { - label: "LBrace".to_string(), - ty: DeclarationId(2157), - }, - Field { - label: "RBrace".to_string(), - ty: DeclarationId(2158), - }, - Field { - label: "LBracket".to_string(), - ty: DeclarationId(2159), - }, - Field { - label: "RBracket".to_string(), - ty: DeclarationId(2160), - }, - Field { - label: "Comma".to_string(), - ty: DeclarationId(2161), - }, - Field { - label: "Semicolon".to_string(), - ty: DeclarationId(2162), - }, - Field { - label: "Pipe".to_string(), - ty: DeclarationId(2163), - }, - Field { - label: "Question".to_string(), - ty: DeclarationId(2164), - }, - Field { - label: "Eof".to_string(), - ty: DeclarationId(2165), -======= - ty: DeclarationId(2119), - }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2122), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2121), + ty: DeclarationId(2123), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2122), + ty: DeclarationId(2124), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2123), + ty: DeclarationId(2125), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2124), + ty: DeclarationId(2126), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2125), + ty: DeclarationId(2127), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2126), + ty: DeclarationId(2128), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2127), + ty: DeclarationId(2129), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2128), + ty: DeclarationId(2130), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2129), + ty: DeclarationId(2131), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2130), + ty: DeclarationId(2132), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2131), + ty: DeclarationId(2133), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2132), + ty: DeclarationId(2134), }, Field { label: "Ident".to_string(), - ty: DeclarationId(2133), + ty: DeclarationId(2135), }, Field { label: "IntLit".to_string(), - ty: DeclarationId(2134), + ty: DeclarationId(2136), }, Field { label: "StringLit".to_string(), - ty: DeclarationId(2135), + ty: DeclarationId(2137), }, Field { label: "Eq".to_string(), - ty: DeclarationId(2136), + ty: DeclarationId(2138), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2137), + ty: DeclarationId(2139), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2138), + ty: DeclarationId(2140), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2139), + ty: DeclarationId(2141), }, Field { label: "Le".to_string(), - ty: DeclarationId(2140), + ty: DeclarationId(2142), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2141), + ty: DeclarationId(2143), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2142), + ty: DeclarationId(2144), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2143), + ty: DeclarationId(2145), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2144), + ty: DeclarationId(2146), }, Field { label: "Star".to_string(), - ty: DeclarationId(2145), + ty: DeclarationId(2147), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2146), + ty: DeclarationId(2148), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2147), + ty: DeclarationId(2149), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2148), + ty: DeclarationId(2150), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2149), + ty: DeclarationId(2151), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2150), + ty: DeclarationId(2152), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2151), + ty: DeclarationId(2153), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2152), + ty: DeclarationId(2154), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2153), + ty: DeclarationId(2155), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2154), + ty: DeclarationId(2156), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2155), + ty: DeclarationId(2157), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2156), + ty: DeclarationId(2158), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2157), + ty: DeclarationId(2159), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2158), + ty: DeclarationId(2160), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2159), + ty: DeclarationId(2161), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2160), + ty: DeclarationId(2162), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2161), + ty: DeclarationId(2163), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2162), + ty: DeclarationId(2164), }, Field { label: "Question".to_string(), - ty: DeclarationId(2163), + ty: DeclarationId(2165), }, Field { label: "Eof".to_string(), - ty: DeclarationId(2164), ->>>>>>> origin/main + ty: DeclarationId(2166), }, ], }, @@ -32041,21 +28752,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 627, 1151), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1051), -======= - id: DeclarationId(1050), ->>>>>>> origin/main + id: DeclarationId(1052), name: Some("Token".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1050), -======= - ty: DeclarationId(1049), ->>>>>>> origin/main + ty: DeclarationId(1051), }, Field { label: "span".to_string(), @@ -32074,125 +28777,65 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1286, 1337), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1052), -======= - id: DeclarationId(1051), ->>>>>>> origin/main + id: DeclarationId(1053), name: Some("KeywordTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2166), - }, - Field { - label: "KwIf".to_string(), ty: DeclarationId(2167), }, - Field { - label: "KwThen".to_string(), - ty: DeclarationId(2168), - }, - Field { - label: "KwElse".to_string(), - ty: DeclarationId(2169), - }, - Field { - label: "KwFn".to_string(), - ty: DeclarationId(2170), - }, - Field { - label: "KwType".to_string(), - ty: DeclarationId(2171), - }, - Field { - label: "KwService".to_string(), - ty: DeclarationId(2172), - }, - Field { - label: "KwModule".to_string(), - ty: DeclarationId(2173), - }, - Field { - label: "KwImport".to_string(), - ty: DeclarationId(2174), - }, - Field { - label: "KwMatch".to_string(), - ty: DeclarationId(2175), - }, - Field { - label: "KwData".to_string(), - ty: DeclarationId(2176), - }, - Field { - label: "KwWhere".to_string(), - ty: DeclarationId(2177), - }, - Field { - label: "KwTrue".to_string(), - ty: DeclarationId(2178), - }, - Field { - label: "KwFalse".to_string(), - ty: DeclarationId(2179), -======= - ty: DeclarationId(2165), - }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2166), + ty: DeclarationId(2168), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2167), + ty: DeclarationId(2169), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2168), + ty: DeclarationId(2170), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2169), + ty: DeclarationId(2171), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2170), + ty: DeclarationId(2172), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2171), + ty: DeclarationId(2173), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2172), + ty: DeclarationId(2174), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2173), + ty: DeclarationId(2175), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2174), + ty: DeclarationId(2176), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2175), + ty: DeclarationId(2177), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2176), + ty: DeclarationId(2178), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2177), + ty: DeclarationId(2179), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2178), ->>>>>>> origin/main + ty: DeclarationId(2180), }, ], }, @@ -32207,237 +28850,121 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 1696, 1876), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1053), -======= - id: DeclarationId(1052), ->>>>>>> origin/main + id: DeclarationId(1054), name: Some("PunctTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Eq".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2180), - }, - Field { - label: "EqEq".to_string(), ty: DeclarationId(2181), }, - Field { - label: "NotEq".to_string(), - ty: DeclarationId(2182), - }, - Field { - label: "Lt".to_string(), - ty: DeclarationId(2183), - }, - Field { - label: "Le".to_string(), - ty: DeclarationId(2184), - }, - Field { - label: "Gt".to_string(), - ty: DeclarationId(2185), - }, - Field { - label: "Ge".to_string(), - ty: DeclarationId(2186), - }, - Field { - label: "Plus".to_string(), - ty: DeclarationId(2187), - }, - Field { - label: "Minus".to_string(), - ty: DeclarationId(2188), - }, - Field { - label: "Star".to_string(), - ty: DeclarationId(2189), - }, - Field { - label: "Slash".to_string(), - ty: DeclarationId(2190), - }, - Field { - label: "AmpAmp".to_string(), - ty: DeclarationId(2191), - }, - Field { - label: "PipePipe".to_string(), - ty: DeclarationId(2192), - }, - Field { - label: "Colon".to_string(), - ty: DeclarationId(2193), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(2194), - }, - Field { - label: "FatArrow".to_string(), - ty: DeclarationId(2195), - }, - Field { - label: "PipeArrow".to_string(), - ty: DeclarationId(2196), - }, - Field { - label: "Dot".to_string(), - ty: DeclarationId(2197), - }, - Field { - label: "LParen".to_string(), - ty: DeclarationId(2198), - }, - Field { - label: "RParen".to_string(), - ty: DeclarationId(2199), - }, - Field { - label: "LBrace".to_string(), - ty: DeclarationId(2200), - }, - Field { - label: "RBrace".to_string(), - ty: DeclarationId(2201), - }, - Field { - label: "LBracket".to_string(), - ty: DeclarationId(2202), - }, - Field { - label: "RBracket".to_string(), - ty: DeclarationId(2203), - }, - Field { - label: "Comma".to_string(), - ty: DeclarationId(2204), - }, - Field { - label: "Semicolon".to_string(), - ty: DeclarationId(2205), - }, - Field { - label: "Pipe".to_string(), - ty: DeclarationId(2206), - }, - Field { - label: "Question".to_string(), - ty: DeclarationId(2207), -======= - ty: DeclarationId(2179), - }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2180), + ty: DeclarationId(2182), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2181), + ty: DeclarationId(2183), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2182), + ty: DeclarationId(2184), }, Field { label: "Le".to_string(), - ty: DeclarationId(2183), + ty: DeclarationId(2185), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2184), + ty: DeclarationId(2186), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2185), + ty: DeclarationId(2187), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2186), + ty: DeclarationId(2188), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2187), + ty: DeclarationId(2189), }, Field { label: "Star".to_string(), - ty: DeclarationId(2188), + ty: DeclarationId(2190), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2189), + ty: DeclarationId(2191), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2190), + ty: DeclarationId(2192), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2191), + ty: DeclarationId(2193), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2192), + ty: DeclarationId(2194), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2193), + ty: DeclarationId(2195), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2194), + ty: DeclarationId(2196), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2195), + ty: DeclarationId(2197), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2196), + ty: DeclarationId(2198), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2197), + ty: DeclarationId(2199), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2198), + ty: DeclarationId(2200), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2199), + ty: DeclarationId(2201), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2200), + ty: DeclarationId(2202), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2201), + ty: DeclarationId(2203), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2202), + ty: DeclarationId(2204), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2203), + ty: DeclarationId(2205), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2204), + ty: DeclarationId(2206), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2205), + ty: DeclarationId(2207), }, Field { label: "Question".to_string(), - ty: DeclarationId(2206), ->>>>>>> origin/main + ty: DeclarationId(2208), }, ], }, @@ -32452,11 +28979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2292, 2598), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1054), -======= - id: DeclarationId(1053), ->>>>>>> origin/main + id: DeclarationId(1055), name: Some("LocalPunctSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -32466,11 +28989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "kind".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1053), -======= - ty: DeclarationId(1052), ->>>>>>> origin/main + ty: DeclarationId(1054), }, ], }, @@ -32485,11 +29004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2808, 2872), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1055), -======= - id: DeclarationId(1054), ->>>>>>> origin/main + id: DeclarationId(1056), name: Some("StringEscapeSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -32514,11 +29029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 3259, 3325), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1056), -======= - id: DeclarationId(1055), ->>>>>>> origin/main + id: DeclarationId(1057), name: Some("Path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(131), @@ -32535,11 +29046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1340, 1360), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1057), -======= - id: DeclarationId(1056), ->>>>>>> origin/main + id: DeclarationId(1058), name: Some("SnapshotRef".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(122), @@ -32556,11 +29063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1361, 1391), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1058), -======= - id: DeclarationId(1057), ->>>>>>> origin/main + id: DeclarationId(1059), name: Some("CensusListConstant".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32574,26 +29077,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1528, 1554), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1059), - name: Some("expected_hand_authored_non_test".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1058), -======= - id: DeclarationId(1058), + id: DeclarationId(1060), name: Some("expected_hand_authored_non_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1057), ->>>>>>> origin/main + template: DeclarationId(1059), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1058)), -======= - meta_tag: Some(DeclarationId(1057)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1059)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -32602,26 +29094,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1556, 1617), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1060), - name: Some("expected_hand_authored_test".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1058), -======= - id: DeclarationId(1059), + id: DeclarationId(1061), name: Some("expected_hand_authored_test".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1057), ->>>>>>> origin/main + template: DeclarationId(1059), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1058)), -======= - meta_tag: Some(DeclarationId(1057)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1059)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -32630,11 +29111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1618, 1675), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1061), -======= - id: DeclarationId(1060), ->>>>>>> origin/main + id: DeclarationId(1062), name: Some("LensProducerFilesSubsetPredicate".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32648,26 +29125,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1807, 1847), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1062), - name: Some("lens_producer_files_subset_predicate".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1061), -======= - id: DeclarationId(1061), + id: DeclarationId(1063), name: Some("lens_producer_files_subset_predicate".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1060), ->>>>>>> origin/main + template: DeclarationId(1062), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1061)), -======= - meta_tag: Some(DeclarationId(1060)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1062)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -32676,11 +29142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 1849, 1929), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1063), -======= - id: DeclarationId(1062), ->>>>>>> origin/main + id: DeclarationId(1064), name: Some("CompilerStdPositiveSetRatchet".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32694,26 +29156,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2008, 2045), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1064), - name: Some("compiler_std_positive_set_ratchet".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1063), -======= - id: DeclarationId(1063), + id: DeclarationId(1065), name: Some("compiler_std_positive_set_ratchet".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1062), ->>>>>>> origin/main + template: DeclarationId(1064), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1063)), -======= - meta_tag: Some(DeclarationId(1062)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1064)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -32722,69 +29173,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2047, 2121), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1065), -======= - id: DeclarationId(1064), ->>>>>>> origin/main + id: DeclarationId(1066), name: Some("DiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2211), - }, - Field { - label: "ParseError".to_string(), ty: DeclarationId(2212), }, - Field { - label: "TypeMismatch".to_string(), - ty: DeclarationId(2213), - }, - Field { - label: "UnitMismatch".to_string(), - ty: DeclarationId(2214), - }, - Field { - label: "ArityMismatch".to_string(), - ty: DeclarationId(2215), - }, - Field { - label: "ResolveError".to_string(), - ty: DeclarationId(2216), - }, - Field { - label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2217), -======= - ty: DeclarationId(2210), - }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2211), + ty: DeclarationId(2213), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2212), + ty: DeclarationId(2214), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2213), + ty: DeclarationId(2215), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2214), + ty: DeclarationId(2216), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2215), + ty: DeclarationId(2217), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2216), ->>>>>>> origin/main + ty: DeclarationId(2218), }, ], }, @@ -32799,29 +29218,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2456, 2606), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1066), -======= - id: DeclarationId(1065), ->>>>>>> origin/main + id: DeclarationId(1067), name: Some("DiagnosticDetailExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnyDetail".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2218), - }, - Field { - label: "Contains".to_string(), ty: DeclarationId(2219), -======= - ty: DeclarationId(2217), }, Field { label: "Contains".to_string(), - ty: DeclarationId(2218), ->>>>>>> origin/main + ty: DeclarationId(2220), }, ], }, @@ -32836,29 +29243,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2975, 3042), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1067), -======= - id: DeclarationId(1066), ->>>>>>> origin/main + id: DeclarationId(1068), name: Some("DiagnosticReference".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1065), - }, - Field { - label: "detail_contains".to_string(), ty: DeclarationId(1066), -======= - ty: DeclarationId(1064), }, Field { label: "detail_contains".to_string(), - ty: DeclarationId(1065), ->>>>>>> origin/main + ty: DeclarationId(1067), }, ], }, @@ -32873,29 +29268,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3186, 3284), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1068), -======= - id: DeclarationId(1067), ->>>>>>> origin/main + id: DeclarationId(1069), name: Some("PortStateExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Resolved".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2220), - }, - Field { - label: "Unresolved".to_string(), ty: DeclarationId(2221), -======= - ty: DeclarationId(2219), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(2220), ->>>>>>> origin/main + ty: DeclarationId(2222), }, ], }, @@ -32910,37 +29293,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3671, 3724), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1069), -======= - id: DeclarationId(1068), ->>>>>>> origin/main + id: DeclarationId(1070), name: Some("AlgebraicLawKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Associativity".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2222), - }, - Field { - label: "Commutativity".to_string(), ty: DeclarationId(2223), }, - Field { - label: "Identity".to_string(), - ty: DeclarationId(2224), -======= - ty: DeclarationId(2221), - }, Field { label: "Commutativity".to_string(), - ty: DeclarationId(2222), ->>>>>>> origin/main + ty: DeclarationId(2224), }, Field { label: "Identity".to_string(), - ty: DeclarationId(2223), + ty: DeclarationId(2225), }, ], }, @@ -32955,189 +29322,97 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4513, 4583), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1070), -======= - id: DeclarationId(1069), ->>>>>>> origin/main + id: DeclarationId(1071), name: Some("TestPredicate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Compiles".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2225), - }, - Field { - label: "FailsWithDiagnostic".to_string(), ty: DeclarationId(2226), }, - Field { - label: "OutputEquals".to_string(), - ty: DeclarationId(2227), - }, - Field { - label: "PortHasState".to_string(), - ty: DeclarationId(2228), - }, - Field { - label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2229), - }, - Field { - label: "CostBounded".to_string(), - ty: DeclarationId(2230), - }, - Field { - label: "BehavioralObservation".to_string(), - ty: DeclarationId(2231), - }, - Field { - label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2232), - }, - Field { - label: "ExecuteCommand".to_string(), - ty: DeclarationId(2234), - }, - Field { - label: "ForAllTargets".to_string(), - ty: DeclarationId(2236), - }, - Field { - label: "LensOutputEquals".to_string(), - ty: DeclarationId(2237), - }, - Field { - label: "DifferentialEquals".to_string(), - ty: DeclarationId(2238), - }, - Field { - label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2239), - }, - Field { - label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2240), - }, - Field { - label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2241), - }, - Field { - label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2242), - }, - Field { - label: "FixedPointConverges".to_string(), - ty: DeclarationId(2243), - }, - Field { - label: "RatchetZero".to_string(), - ty: DeclarationId(2244), - }, - Field { - label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2246), - }, - Field { - label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2247), - }, - Field { - label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2248), - }, - Field { - label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2249), -======= - ty: DeclarationId(2224), - }, Field { label: "FailsWithDiagnostic".to_string(), - ty: DeclarationId(2225), + ty: DeclarationId(2227), }, Field { label: "OutputEquals".to_string(), - ty: DeclarationId(2226), + ty: DeclarationId(2228), }, Field { label: "PortHasState".to_string(), - ty: DeclarationId(2227), + ty: DeclarationId(2229), }, Field { label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2228), + ty: DeclarationId(2230), }, Field { label: "CostBounded".to_string(), - ty: DeclarationId(2229), + ty: DeclarationId(2231), }, Field { label: "BehavioralObservation".to_string(), - ty: DeclarationId(2230), + ty: DeclarationId(2232), }, Field { label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2231), + ty: DeclarationId(2233), }, Field { label: "ExecuteCommand".to_string(), - ty: DeclarationId(2233), + ty: DeclarationId(2235), }, Field { label: "ForAllTargets".to_string(), - ty: DeclarationId(2235), + ty: DeclarationId(2237), }, Field { label: "LensOutputEquals".to_string(), - ty: DeclarationId(2236), + ty: DeclarationId(2238), }, Field { label: "DifferentialEquals".to_string(), - ty: DeclarationId(2237), + ty: DeclarationId(2239), }, Field { label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2238), + ty: DeclarationId(2240), }, Field { label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2239), + ty: DeclarationId(2241), }, Field { label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2240), + ty: DeclarationId(2242), }, Field { label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2241), + ty: DeclarationId(2243), }, Field { label: "FixedPointConverges".to_string(), - ty: DeclarationId(2242), + ty: DeclarationId(2244), }, Field { label: "RatchetZero".to_string(), - ty: DeclarationId(2243), + ty: DeclarationId(2245), }, Field { label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2245), + ty: DeclarationId(2247), }, Field { label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2246), + ty: DeclarationId(2248), }, Field { label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2247), + ty: DeclarationId(2249), }, Field { label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2248), ->>>>>>> origin/main + ty: DeclarationId(2250), }, ], }, @@ -33152,11 +29427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4585, 12806), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1071), -======= - id: DeclarationId(1070), ->>>>>>> origin/main + id: DeclarationId(1072), name: Some("ProgramInput".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33170,20 +29441,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12914, 12934), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1072), -======= - id: DeclarationId(1071), ->>>>>>> origin/main + id: DeclarationId(1073), name: Some("ProgramOutputBind".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "output_ref".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }], }, type_params: vec![], @@ -33197,11 +29460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13077, 13132), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1073), -======= - id: DeclarationId(1072), ->>>>>>> origin/main + id: DeclarationId(1074), name: Some("TestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -33219,19 +29478,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "predicate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1070), - }, - Field { - label: "requires".to_string(), - ty: DeclarationId(2250), -======= - ty: DeclarationId(1069), + ty: DeclarationId(1071), }, Field { label: "requires".to_string(), - ty: DeclarationId(2249), ->>>>>>> origin/main + ty: DeclarationId(2251), }, ], }, @@ -33246,11 +29497,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13742, 13875), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1074), -======= - id: DeclarationId(1073), ->>>>>>> origin/main + id: DeclarationId(1075), name: Some("TestSuite".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -33260,11 +29507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "claims".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2251), -======= - ty: DeclarationId(2250), ->>>>>>> origin/main + ty: DeclarationId(2252), }, ], }, @@ -33279,11 +29522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13877, 13936), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1075), -======= - id: DeclarationId(1074), ->>>>>>> origin/main + id: DeclarationId(1076), name: Some("TestObligation".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -33293,11 +29532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "resources".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2252), -======= - ty: DeclarationId(2251), ->>>>>>> origin/main + ty: DeclarationId(2253), }, ], }, @@ -33312,19 +29547,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14134, 14215), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1076), - name: Some("claim_obligation_resources".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1073)], - output: DeclarationId(2208), -======= - id: DeclarationId(1075), + id: DeclarationId(1077), name: Some("claim_obligation_resources".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1072)], - output: DeclarationId(2207), ->>>>>>> origin/main + inputs: vec![DeclarationId(1074)], + output: DeclarationId(2209), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14657, @@ -33342,19 +29569,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14586, 14673), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1077), - name: Some("obligation_for_claim".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1073)], - output: DeclarationId(1075), -======= - id: DeclarationId(1076), + id: DeclarationId(1078), name: Some("obligation_for_claim".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1072)], - output: DeclarationId(1074), ->>>>>>> origin/main + inputs: vec![DeclarationId(1074)], + output: DeclarationId(1076), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14731, @@ -33372,19 +29591,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14675, 14816), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1078), - name: Some("materialize_test_obligations".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2209)], - output: DeclarationId(2210), -======= - id: DeclarationId(1077), + id: DeclarationId(1079), name: Some("materialize_test_obligations".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(2208)], - output: DeclarationId(2209), ->>>>>>> origin/main + inputs: vec![DeclarationId(2210)], + output: DeclarationId(2211), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14899, @@ -33402,21 +29613,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14818, 14938), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1079), - name: Some("behavior_spine".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744)], - output: DeclarationId(2253), - body: ArrowBody::UserDefined(NodeId(240)), -======= - id: DeclarationId(1078), + id: DeclarationId(1080), name: Some("behavior_spine".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745)], - output: DeclarationId(2252), + output: DeclarationId(2254), body: ArrowBody::UserDefined(BindNodeId::new_unchecked(NodeId(240))), ->>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -33429,11 +29631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 963, 1018), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1080), -======= - id: DeclarationId(1079), ->>>>>>> origin/main + id: DeclarationId(1081), name: Some("ValueBehavior".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33447,11 +29645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2935, 2956), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1081), -======= - id: DeclarationId(1080), ->>>>>>> origin/main + id: DeclarationId(1082), name: Some("Transform".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33465,11 +29659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2957, 2974), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1082), -======= - id: DeclarationId(1081), ->>>>>>> origin/main + id: DeclarationId(1083), name: Some("Branch".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33483,11 +29673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2975, 2989), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1083), -======= - id: DeclarationId(1082), ->>>>>>> origin/main + id: DeclarationId(1084), name: Some("Loop".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33501,11 +29687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 2990, 3002), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1084), -======= - id: DeclarationId(1083), ->>>>>>> origin/main + id: DeclarationId(1085), name: Some("Bind".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33519,11 +29701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3003, 3015), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1085), -======= - id: DeclarationId(1084), ->>>>>>> origin/main + id: DeclarationId(1086), name: Some("Main".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33537,11 +29715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3016, 3028), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1086), -======= - id: DeclarationId(1085), ->>>>>>> origin/main + id: DeclarationId(1087), name: Some("DeclarationRef".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -33555,11 +29729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/v3_l1.dag", 3761, 3783), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1087), -======= - id: DeclarationId(1086), ->>>>>>> origin/main + id: DeclarationId(1088), name: Some("go_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -33575,22 +29745,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1869), -======= - constructor: DeclarationId(1868), ->>>>>>> origin/main + constructor: DeclarationId(1870), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1872), -======= - constructor: DeclarationId(1871), ->>>>>>> origin/main + constructor: DeclarationId(1873), payload: vec![], }, ), @@ -33601,11 +29763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1630, 1732), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1088), -======= - id: DeclarationId(1087), ->>>>>>> origin/main + id: DeclarationId(1089), name: Some("go_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(859), @@ -33635,11 +29793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1734, 1884), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1089), -======= - id: DeclarationId(1088), ->>>>>>> origin/main + id: DeclarationId(1090), name: Some("go_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(861), @@ -33660,11 +29814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1886, 1961), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1090), -======= - id: DeclarationId(1089), ->>>>>>> origin/main + id: DeclarationId(1091), name: Some("go_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33679,11 +29829,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -33706,11 +29852,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 1963, 2093), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1091), -======= - id: DeclarationId(1090), ->>>>>>> origin/main + id: DeclarationId(1092), name: Some("go_int32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33725,11 +29867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -33752,11 +29890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2095, 2229), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1092), -======= - id: DeclarationId(1091), ->>>>>>> origin/main + id: DeclarationId(1093), name: Some("go_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33771,7 +29905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "kernel_integer".to_string(), @@ -33784,15 +29918,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1927), + constructor: DeclarationId(1929), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1597), + constructor: DeclarationId(1599), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1596), + constructor: DeclarationId(1598), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1594), + constructor: DeclarationId(1596), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -33804,7 +29938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1090)), + FieldValue::Reference(DeclarationId(1092)), ), ], }), @@ -33813,7 +29947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2231, 2534), }); declarations.push(Declaration { - id: DeclarationId(1092), + id: DeclarationId(1094), name: Some("go_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33828,68 +29962,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "kernel_integer".to_string(), - FieldValue::Reference(DeclarationId(73)), - ), - ( - "algebra".to_string(), - FieldValue::Reference(DeclarationId(73)), - ), - ( - "bound".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1928), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1598), - payload: vec![ - FieldValue::Literal(LiteralBits::Int(-2147483648)), - FieldValue::Variant { - constructor: DeclarationId(1597), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1595), - payload: vec![FieldValue::Literal(LiteralBits::Int( - 4294967295, - ))], - }], - }, - ], - }], - }, - ), - ( - "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1091)), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 2231, 2534), - }); - declarations.push(Declaration { - id: DeclarationId(1093), - name: Some("go_bool".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(897), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(897)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -33912,11 +29985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2536, 2667), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1094), -======= - id: DeclarationId(1093), ->>>>>>> origin/main + id: DeclarationId(1095), name: Some("go_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33931,11 +30000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -33958,11 +30023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2669, 2806), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1095), -======= - id: DeclarationId(1094), ->>>>>>> origin/main + id: DeclarationId(1096), name: Some("go_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33977,11 +30038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34004,11 +30061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2808, 2946), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1096), -======= - id: DeclarationId(1095), ->>>>>>> origin/main + id: DeclarationId(1097), name: Some("go_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34023,11 +30076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34050,11 +30099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 2948, 3086), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1097), -======= - id: DeclarationId(1096), ->>>>>>> origin/main + id: DeclarationId(1098), name: Some("go_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34069,11 +30114,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34096,11 +30137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3088, 3247), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1098), -======= - id: DeclarationId(1097), ->>>>>>> origin/main + id: DeclarationId(1099), name: Some("go_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34115,11 +30152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34142,11 +30175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3249, 3396), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1099), -======= - id: DeclarationId(1098), ->>>>>>> origin/main + id: DeclarationId(1100), name: Some("go_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34161,11 +30190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34189,11 +30214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -34213,11 +30234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3398, 3639), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1100), -======= - id: DeclarationId(1099), ->>>>>>> origin/main + id: DeclarationId(1101), name: Some("go_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34232,11 +30249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34259,11 +30272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3641, 3789), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1101), -======= - id: DeclarationId(1100), ->>>>>>> origin/main + id: DeclarationId(1102), name: Some("go_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34278,11 +30287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34307,11 +30312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -34330,11 +30331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -34355,11 +30352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -34380,11 +30373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 3791, 4174), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1102), -======= - id: DeclarationId(1101), ->>>>>>> origin/main + id: DeclarationId(1103), name: Some("go_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34399,11 +30388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34428,11 +30413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -34451,11 +30432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -34474,11 +30451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -34499,11 +30472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4176, 4570), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1103), -======= - id: DeclarationId(1102), ->>>>>>> origin/main + id: DeclarationId(1104), name: Some("go_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34518,11 +30487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34545,11 +30510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4572, 4726), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1104), -======= - id: DeclarationId(1103), ->>>>>>> origin/main + id: DeclarationId(1105), name: Some("go_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34564,11 +30525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34591,11 +30548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4728, 4882), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1105), -======= - id: DeclarationId(1104), ->>>>>>> origin/main + id: DeclarationId(1106), name: Some("go_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34610,11 +30563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34637,11 +30586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 4884, 5053), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1106), -======= - id: DeclarationId(1105), ->>>>>>> origin/main + id: DeclarationId(1107), name: Some("go_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34656,11 +30601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34683,11 +30624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5055, 5199), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1107), -======= - id: DeclarationId(1106), ->>>>>>> origin/main + id: DeclarationId(1108), name: Some("go_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34702,11 +30639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34731,11 +30664,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5201, 5386), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1108), -======= - id: DeclarationId(1107), ->>>>>>> origin/main + id: DeclarationId(1109), name: Some("go_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34750,11 +30679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34777,11 +30702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5388, 5548), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1109), -======= - id: DeclarationId(1108), ->>>>>>> origin/main + id: DeclarationId(1110), name: Some("go_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34796,11 +30717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34825,11 +30742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -34848,11 +30761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -34873,11 +30782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5550, 5852), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1110), -======= - id: DeclarationId(1109), ->>>>>>> origin/main + id: DeclarationId(1111), name: Some("go_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34892,11 +30797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -34923,11 +30824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -34946,11 +30843,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -34971,11 +30864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 5854, 6191), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1111), -======= - id: DeclarationId(1110), ->>>>>>> origin/main + id: DeclarationId(1112), name: Some("go_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34990,11 +30879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35021,11 +30906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -35044,11 +30925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -35069,11 +30946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6193, 6534), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1112), -======= - id: DeclarationId(1111), ->>>>>>> origin/main + id: DeclarationId(1113), name: Some("go_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35088,11 +30961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35118,11 +30987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -35142,11 +31007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6536, 6808), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1113), -======= - id: DeclarationId(1112), ->>>>>>> origin/main + id: DeclarationId(1114), name: Some("go_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35161,11 +31022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35190,11 +31047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -35213,11 +31066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -35238,11 +31087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 6810, 7121), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1114), -======= - id: DeclarationId(1113), ->>>>>>> origin/main + id: DeclarationId(1115), name: Some("go_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35257,11 +31102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35286,11 +31127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -35309,11 +31146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -35334,11 +31167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7123, 7439), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1115), -======= - id: DeclarationId(1114), ->>>>>>> origin/main + id: DeclarationId(1116), name: Some("go_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35353,11 +31182,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35382,11 +31207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -35405,11 +31226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -35428,11 +31245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -35453,11 +31266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7441, 7850), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1116), -======= - id: DeclarationId(1115), ->>>>>>> origin/main + id: DeclarationId(1117), name: Some("go_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35472,11 +31281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35501,11 +31306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -35524,11 +31325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -35549,11 +31346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 7852, 8168), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1117), -======= - id: DeclarationId(1116), ->>>>>>> origin/main + id: DeclarationId(1118), name: Some("go_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35568,11 +31361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35596,11 +31385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -35620,11 +31405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8170, 8411), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1118), -======= - id: DeclarationId(1117), ->>>>>>> origin/main + id: DeclarationId(1119), name: Some("go_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35639,11 +31420,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35667,11 +31444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -35691,11 +31464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8413, 8654), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1119), -======= - id: DeclarationId(1118), ->>>>>>> origin/main + id: DeclarationId(1120), name: Some("go_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35710,11 +31479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35738,11 +31503,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -35762,11 +31523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8656, 8915), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1120), -======= - id: DeclarationId(1119), ->>>>>>> origin/main + id: DeclarationId(1121), name: Some("go_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35781,11 +31538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35810,11 +31563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -35835,11 +31584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -35860,11 +31605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 8917, 9250), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1121), -======= - id: DeclarationId(1120), ->>>>>>> origin/main + id: DeclarationId(1122), name: Some("go_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35879,11 +31620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35906,11 +31643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9252, 9403), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1122), -======= - id: DeclarationId(1121), ->>>>>>> origin/main + id: DeclarationId(1123), name: Some("go_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35925,11 +31658,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35952,11 +31681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9405, 9553), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1123), -======= - id: DeclarationId(1122), ->>>>>>> origin/main + id: DeclarationId(1124), name: Some("go_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35971,11 +31696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -35998,11 +31719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9555, 9703), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1124), -======= - id: DeclarationId(1123), ->>>>>>> origin/main + id: DeclarationId(1125), name: Some("go_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36017,11 +31734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36044,11 +31757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9705, 9868), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1125), -======= - id: DeclarationId(1124), ->>>>>>> origin/main + id: DeclarationId(1126), name: Some("go_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36063,11 +31772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36092,11 +31797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -36115,11 +31816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -36140,11 +31837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -36165,11 +31858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -36190,11 +31879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -36215,11 +31900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -36240,11 +31921,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -36265,11 +31942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -36290,11 +31963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -36313,11 +31982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -36338,11 +32003,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 9870, 10887), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1126), -======= - id: DeclarationId(1125), ->>>>>>> origin/main + id: DeclarationId(1127), name: Some("go_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36357,11 +32018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36384,11 +32041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 10889, 11046), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1127), -======= - id: DeclarationId(1126), ->>>>>>> origin/main + id: DeclarationId(1128), name: Some("go_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36403,11 +32056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36430,11 +32079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11048, 11205), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1128), -======= - id: DeclarationId(1127), ->>>>>>> origin/main + id: DeclarationId(1129), name: Some("go_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36449,11 +32094,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36476,11 +32117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11207, 11355), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1129), -======= - id: DeclarationId(1128), ->>>>>>> origin/main + id: DeclarationId(1130), name: Some("go_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36495,11 +32132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36522,11 +32155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11357, 11514), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1130), -======= - id: DeclarationId(1129), ->>>>>>> origin/main + id: DeclarationId(1131), name: Some("go_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36541,11 +32170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36568,11 +32193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11516, 11682), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1131), -======= - id: DeclarationId(1130), ->>>>>>> origin/main + id: DeclarationId(1132), name: Some("go_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36587,11 +32208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36614,11 +32231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11684, 11844), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1132), -======= - id: DeclarationId(1131), ->>>>>>> origin/main + id: DeclarationId(1133), name: Some("go_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36633,11 +32246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36664,11 +32273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -36689,11 +32294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -36714,11 +32315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 11846, 12197), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1133), -======= - id: DeclarationId(1132), ->>>>>>> origin/main + id: DeclarationId(1134), name: Some("go_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36733,11 +32330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36762,11 +32355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -36787,11 +32376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -36810,11 +32395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -36833,11 +32414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -36858,11 +32435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12199, 12686), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1134), -======= - id: DeclarationId(1133), ->>>>>>> origin/main + id: DeclarationId(1135), name: Some("go_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36877,11 +32450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36904,11 +32473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 12688, 12836), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1135), -======= - id: DeclarationId(1134), ->>>>>>> origin/main + id: DeclarationId(1136), name: Some("go_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36923,11 +32488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -36952,11 +32513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -36975,11 +32532,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -37000,11 +32553,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -37023,11 +32572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37048,11 +32593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13310, 13784), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1136), -======= - id: DeclarationId(1135), ->>>>>>> origin/main + id: DeclarationId(1137), name: Some("go_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37067,11 +32608,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -37096,11 +32633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -37119,11 +32652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -37142,11 +32671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -37167,11 +32692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -37190,11 +32711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37215,11 +32732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 13786, 14351), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1137), -======= - id: DeclarationId(1136), ->>>>>>> origin/main + id: DeclarationId(1138), name: Some("go_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37234,11 +32747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -37263,11 +32772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -37286,11 +32791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -37309,11 +32810,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -37334,11 +32831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -37357,11 +32850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37382,11 +32871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -37407,11 +32892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 14353, 15010), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1138), -======= - id: DeclarationId(1137), ->>>>>>> origin/main + id: DeclarationId(1139), name: Some("go_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37426,11 +32907,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -37455,11 +32932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -37478,11 +32951,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -37501,11 +32970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -37524,11 +32989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -37547,11 +33008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -37572,11 +33029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -37595,11 +33048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37620,11 +33069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15012, 15714), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1139), -======= - id: DeclarationId(1138), ->>>>>>> origin/main + id: DeclarationId(1140), name: Some("go_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37639,11 +33084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -37668,11 +33109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -37691,11 +33128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37716,11 +33149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -37739,11 +33168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -37762,11 +33187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37787,11 +33208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -37812,11 +33229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 15716, 16367), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1140), -======= - id: DeclarationId(1139), ->>>>>>> origin/main + id: DeclarationId(1141), name: Some("go_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37831,11 +33244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -37858,11 +33267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16369, 16513), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1141), -======= - id: DeclarationId(1140), ->>>>>>> origin/main + id: DeclarationId(1142), name: Some("go_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37877,11 +33282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -37908,11 +33309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -37931,11 +33328,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -37954,11 +33347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -37979,11 +33368,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -38004,11 +33389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 16515, 16982), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1142), -======= - id: DeclarationId(1141), ->>>>>>> origin/main + id: DeclarationId(1143), name: Some("go_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38023,11 +33404,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38051,11 +33428,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -38075,11 +33448,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17285, 17526), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1143), -======= - id: DeclarationId(1142), ->>>>>>> origin/main + id: DeclarationId(1144), name: Some("go_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38094,11 +33463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38121,11 +33486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17528, 17682), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1144), -======= - id: DeclarationId(1143), ->>>>>>> origin/main + id: DeclarationId(1145), name: Some("go_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38140,11 +33501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38169,11 +33526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -38192,11 +33545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -38217,11 +33566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -38242,11 +33587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 17684, 18082), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1145), -======= - id: DeclarationId(1144), ->>>>>>> origin/main + id: DeclarationId(1146), name: Some("go_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38261,11 +33602,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38290,11 +33627,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -38313,11 +33646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -38338,11 +33667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18084, 18393), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1146), -======= - id: DeclarationId(1145), ->>>>>>> origin/main + id: DeclarationId(1147), name: Some("go_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38357,11 +33682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38386,11 +33707,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -38409,11 +33726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -38432,11 +33745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38457,11 +33766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18395, 18797), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1147), -======= - id: DeclarationId(1146), ->>>>>>> origin/main + id: DeclarationId(1148), name: Some("go_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38476,11 +33781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38503,11 +33804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18799, 18962), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1148), -======= - id: DeclarationId(1147), ->>>>>>> origin/main + id: DeclarationId(1149), name: Some("go_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38522,11 +33819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38549,11 +33842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 18964, 19118), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1149), -======= - id: DeclarationId(1148), ->>>>>>> origin/main + id: DeclarationId(1150), name: Some("go_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38568,11 +33857,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38597,11 +33882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -38620,11 +33901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -38643,11 +33920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38668,11 +33941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19120, 19531), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1150), -======= - id: DeclarationId(1149), ->>>>>>> origin/main + id: DeclarationId(1151), name: Some("go_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38687,11 +33956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38716,11 +33981,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -38741,11 +34002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -38764,11 +34021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -38787,11 +34040,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38812,11 +34061,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 19533, 20018), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1151), -======= - id: DeclarationId(1150), ->>>>>>> origin/main + id: DeclarationId(1152), name: Some("go_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38831,11 +34076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38860,11 +34101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -38883,11 +34120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -38906,11 +34139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -38931,11 +34160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20020, 20426), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1152), -======= - id: DeclarationId(1151), ->>>>>>> origin/main + id: DeclarationId(1153), name: Some("go_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -38950,11 +34175,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -38979,11 +34200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -39002,11 +34219,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -39025,11 +34238,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -39050,11 +34259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20428, 20846), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1153), -======= - id: DeclarationId(1152), ->>>>>>> origin/main + id: DeclarationId(1154), name: Some("go_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -39069,11 +34274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39096,11 +34297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 20848, 21011), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1154), -======= - id: DeclarationId(1153), ->>>>>>> origin/main + id: DeclarationId(1155), name: Some("go_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -39115,11 +34312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39142,11 +34335,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21013, 21176), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1155), -======= - id: DeclarationId(1154), ->>>>>>> origin/main + id: DeclarationId(1156), name: Some("go_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -39161,11 +34350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39188,11 +34373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21178, 21332), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1156), -======= - id: DeclarationId(1155), ->>>>>>> origin/main + id: DeclarationId(1157), name: Some("go_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39207,11 +34388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39230,11 +34407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21334, 21475), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1157), -======= - id: DeclarationId(1156), ->>>>>>> origin/main + id: DeclarationId(1158), name: Some("go_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39249,11 +34422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39272,11 +34441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21477, 21618), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1158), -======= - id: DeclarationId(1157), ->>>>>>> origin/main + id: DeclarationId(1159), name: Some("go_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39291,11 +34456,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39314,11 +34475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21620, 21761), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1159), -======= - id: DeclarationId(1158), ->>>>>>> origin/main + id: DeclarationId(1160), name: Some("go_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39333,11 +34490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39358,11 +34511,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21763, 21911), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1160), -======= - id: DeclarationId(1159), ->>>>>>> origin/main + id: DeclarationId(1161), name: Some("go_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39377,11 +34526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39400,11 +34545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 21913, 22053), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1161), -======= - id: DeclarationId(1160), ->>>>>>> origin/main + id: DeclarationId(1162), name: Some("go_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39419,11 +34560,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39442,11 +34579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22055, 22202), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1162), -======= - id: DeclarationId(1161), ->>>>>>> origin/main + id: DeclarationId(1163), name: Some("go_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39461,11 +34594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39484,11 +34613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22204, 22351), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1163), -======= - id: DeclarationId(1162), ->>>>>>> origin/main + id: DeclarationId(1164), name: Some("go_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39503,11 +34628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39526,11 +34647,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22353, 22514), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1164), -======= - id: DeclarationId(1163), ->>>>>>> origin/main + id: DeclarationId(1165), name: Some("go_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39545,11 +34662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39568,11 +34681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22516, 22656), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1165), -======= - id: DeclarationId(1164), ->>>>>>> origin/main + id: DeclarationId(1166), name: Some("go_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39587,11 +34696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39610,11 +34715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22658, 22805), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1166), -======= - id: DeclarationId(1165), ->>>>>>> origin/main + id: DeclarationId(1167), name: Some("go_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39629,11 +34730,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39652,11 +34749,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22807, 22954), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1167), -======= - id: DeclarationId(1166), ->>>>>>> origin/main + id: DeclarationId(1168), name: Some("go_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39671,11 +34764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39694,11 +34783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 22956, 23117), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1168), -======= - id: DeclarationId(1167), ->>>>>>> origin/main + id: DeclarationId(1169), name: Some("go_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39713,11 +34798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39736,11 +34817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23119, 23258), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1169), -======= - id: DeclarationId(1168), ->>>>>>> origin/main + id: DeclarationId(1170), name: Some("go_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39755,11 +34832,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39778,11 +34851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23260, 23400), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1170), -======= - id: DeclarationId(1169), ->>>>>>> origin/main + id: DeclarationId(1171), name: Some("go_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39797,11 +34866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39820,11 +34885,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23402, 23541), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1171), -======= - id: DeclarationId(1170), ->>>>>>> origin/main + id: DeclarationId(1172), name: Some("go_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39839,11 +34900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39862,11 +34919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23543, 23683), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1172), -======= - id: DeclarationId(1171), ->>>>>>> origin/main + id: DeclarationId(1173), name: Some("go_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39881,11 +34934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39904,11 +34953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23685, 23834), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1173), -======= - id: DeclarationId(1172), ->>>>>>> origin/main + id: DeclarationId(1174), name: Some("go_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -39923,11 +34968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -39946,11 +34987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23836, 23985), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1174), -======= - id: DeclarationId(1173), ->>>>>>> origin/main + id: DeclarationId(1175), name: Some("go_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -39965,19 +35002,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1084)), -======= - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1083)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1085)), ), ( "carrier".to_string(), @@ -39993,11 +35022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 23987, 24120), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1175), -======= - id: DeclarationId(1174), ->>>>>>> origin/main + id: DeclarationId(1176), name: Some("go_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -40012,19 +35037,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1082)), -======= - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1081)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1083)), ), ( "carrier".to_string(), @@ -40040,11 +35057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24122, 24265), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1176), -======= - id: DeclarationId(1175), ->>>>>>> origin/main + id: DeclarationId(1177), name: Some("go_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -40059,19 +35072,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1085)), -======= - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1084)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1086)), ), ( "carrier".to_string(), @@ -40087,11 +35092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24267, 24420), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1177), -======= - id: DeclarationId(1176), ->>>>>>> origin/main + id: DeclarationId(1178), name: Some("go_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40106,11 +35107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40119,11 +35116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1942), -======= - constructor: DeclarationId(1941), ->>>>>>> origin/main + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -40136,11 +35129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24422, 24560), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1178), -======= - id: DeclarationId(1177), ->>>>>>> origin/main + id: DeclarationId(1179), name: Some("go_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40155,11 +35144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40168,10 +35153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1943), -======= - constructor: DeclarationId(1942), + constructor: DeclarationId(1944), payload: vec![], }, ), @@ -40182,7 +35164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -40196,7 +35178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24562, 24754), }); declarations.push(Declaration { - id: DeclarationId(1178), + id: DeclarationId(1180), name: Some("go_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40211,7 +35193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40220,7 +35202,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -40232,7 +35214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -40242,7 +35224,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -40257,7 +35239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24756, 24973), }); declarations.push(Declaration { - id: DeclarationId(1179), + id: DeclarationId(1181), name: Some("go_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40272,7 +35254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40281,7 +35263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1944), + constructor: DeclarationId(1946), payload: vec![], }, ), @@ -40293,7 +35275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -40303,7 +35285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -40318,7 +35300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 24975, 25198), }); declarations.push(Declaration { - id: DeclarationId(1180), + id: DeclarationId(1182), name: Some("go_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40333,7 +35315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40342,8 +35324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1945), ->>>>>>> origin/main + constructor: DeclarationId(1947), payload: vec![], }, ), @@ -40365,188 +35346,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/go.dag", 24562, 24754), - }); - declarations.push(Declaration { - id: DeclarationId(1179), - name: Some("go_cons_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(608)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1944), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 24756, 24973), - }); - declarations.push(Declaration { - id: DeclarationId(1180), - name: Some("go_concat_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(618)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1945), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 24975, 25198), - }); - declarations.push(Declaration { - id: DeclarationId(1181), - name: Some("go_length_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(628)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1946), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ])]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 25200, 25383), - }); - declarations.push(Declaration { - id: DeclarationId(1182), -======= span: SourceSpan::new("src/v3/spec/go.dag", 25200, 25383), }); declarations.push(Declaration { - id: DeclarationId(1181), ->>>>>>> origin/main + id: DeclarationId(1183), name: Some("go_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -40561,11 +35364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40583,11 +35382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 25385, 25521), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1183), -======= - id: DeclarationId(1182), ->>>>>>> origin/main + id: DeclarationId(1184), name: Some("go_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -40602,11 +35397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40626,11 +35417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26207, 26360), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1184), -======= - id: DeclarationId(1183), ->>>>>>> origin/main + id: DeclarationId(1185), name: Some("go_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -40645,11 +35432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40667,11 +35450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26362, 26502), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1185), -======= - id: DeclarationId(1184), ->>>>>>> origin/main + id: DeclarationId(1186), name: Some("go_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40686,11 +35465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40699,11 +35474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1947), -======= - constructor: DeclarationId(1946), ->>>>>>> origin/main + constructor: DeclarationId(1948), payload: vec![], }, ), @@ -40714,11 +35485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -40732,11 +35499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26504, 26692), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1186), -======= - id: DeclarationId(1185), ->>>>>>> origin/main + id: DeclarationId(1187), name: Some("go_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40751,11 +35514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40764,9 +35523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD -======= - constructor: DeclarationId(1947), + constructor: DeclarationId(1949), payload: vec![], }, ), @@ -40778,7 +35535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1931), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -40788,7 +35545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -40798,7 +35555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1931), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -40813,7 +35570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 26694, 26951), }); declarations.push(Declaration { - id: DeclarationId(1186), + id: DeclarationId(1188), name: Some("go_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -40828,7 +35585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -40837,8 +35594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { ->>>>>>> origin/main - constructor: DeclarationId(1948), + constructor: DeclarationId(1950), payload: vec![], }, ), @@ -40850,11 +35606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -40864,25 +35616,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD constructor: DeclarationId(1933), payload: vec![], }, ), ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(2))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), ]), ), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), @@ -40890,19 +35628,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/go.dag", 26694, 26951), - }); - declarations.push(Declaration { - id: DeclarationId(1187), - name: Some("go_map_callable".to_string()), -======= span: SourceSpan::new("src/v3/spec/go.dag", 26953, 27167), }); declarations.push(Declaration { - id: DeclarationId(1187), + id: DeclarationId(1189), name: Some("go_filter_callable".to_string()), ->>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -40916,24 +35646,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(620)), -======= - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), FieldValue::Reference(DeclarationId(623)), ->>>>>>> origin/main ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -40945,11 +35667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -40959,11 +35677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -40975,113 +35689,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/go.dag", 26953, 27167), - }); - declarations.push(Declaration { - id: DeclarationId(1188), - name: Some("go_filter_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), -======= span: SourceSpan::new("src/v3/spec/go.dag", 27169, 27392), }); declarations.push(Declaration { - id: DeclarationId(1188), + id: DeclarationId(1190), name: Some("go_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), ->>>>>>> origin/main arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(904)), -======= meta_tag: Some(DeclarationId(905)), ->>>>>>> origin/main - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(623)), -======= - FieldValue::Reference(DeclarationId(1202)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(638)), ->>>>>>> origin/main - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1950), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27169, 27392), - }); - declarations.push(Declaration { - id: DeclarationId(1189), - name: Some("go_contains_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1203)), + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -41090,7 +35716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1951), + constructor: DeclarationId(1952), payload: vec![], }, ), @@ -41102,7 +35728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -41112,10 +35738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -41130,11 +35753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27394, 27623), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1190), -======= - id: DeclarationId(1189), ->>>>>>> origin/main + id: DeclarationId(1191), name: Some("go_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(914), @@ -41149,11 +35768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), -======= - FieldValue::Reference(DeclarationId(1202)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1204)), ), ( "target".to_string(), @@ -41162,29 +35777,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1953), -======= - constructor: DeclarationId(1952), ->>>>>>> origin/main + constructor: DeclarationId(1954), payload: vec![], }, ), ( "empty_variant".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1504)), - ), - ( - "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1506)), -======= - FieldValue::Reference(DeclarationId(1503)), + FieldValue::Reference(DeclarationId(1505)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1505)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1507)), ), ( "scrutinee".to_string(), @@ -41214,11 +35817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 27710, 28016), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1191), -======= - id: DeclarationId(1190), ->>>>>>> origin/main + id: DeclarationId(1192), name: Some("go_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -41248,11 +35847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28018, 28148), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1192), -======= - id: DeclarationId(1191), ->>>>>>> origin/main + id: DeclarationId(1193), name: Some("go_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -41286,11 +35881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28150, 28310), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1193), -======= - id: DeclarationId(1192), ->>>>>>> origin/main + id: DeclarationId(1194), name: Some("go_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -41335,11 +35926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28312, 28513), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1194), -======= - id: DeclarationId(1193), ->>>>>>> origin/main + id: DeclarationId(1195), name: Some("go_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -41371,11 +35958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28515, 28625), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1195), -======= - id: DeclarationId(1194), ->>>>>>> origin/main + id: DeclarationId(1196), name: Some("go_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -41397,11 +35980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28627, 28684), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1196), -======= - id: DeclarationId(1195), ->>>>>>> origin/main + id: DeclarationId(1197), name: Some("go_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -41447,11 +36026,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28686, 28971), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1197), -======= - id: DeclarationId(1196), ->>>>>>> origin/main + id: DeclarationId(1198), name: Some("go_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -41473,11 +36048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 28973, 29052), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1198), -======= - id: DeclarationId(1197), ->>>>>>> origin/main + id: DeclarationId(1199), name: Some("go_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -41521,11 +36092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29054, 29277), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1199), -======= - id: DeclarationId(1198), ->>>>>>> origin/main + id: DeclarationId(1200), name: Some("go_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(926), @@ -41579,11 +36146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29279, 29571), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1200), -======= - id: DeclarationId(1199), ->>>>>>> origin/main + id: DeclarationId(1201), name: Some("go_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), @@ -41657,11 +36220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 29573, 30008), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1201), -======= - id: DeclarationId(1200), ->>>>>>> origin/main + id: DeclarationId(1202), name: Some("go_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -41705,11 +36264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 30010, 30278), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1202), -======= - id: DeclarationId(1201), ->>>>>>> origin/main + id: DeclarationId(1203), name: Some("go_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -41737,11 +36292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31035, 31150), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1203), -======= - id: DeclarationId(1202), ->>>>>>> origin/main + id: DeclarationId(1204), name: Some("go_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(932), @@ -41756,99 +36307,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1191)), - ), - ( - "expressions".to_string(), FieldValue::Reference(DeclarationId(1192)), ), - ( - "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1193)), - ), - ( - "literals".to_string(), - FieldValue::Reference(DeclarationId(1194)), - ), - ( - "modules".to_string(), - FieldValue::Reference(DeclarationId(1195)), - ), - ( - "functions".to_string(), - FieldValue::Reference(DeclarationId(1196)), - ), - ( - "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1197)), - ), - ( - "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1198)), - ), - ( - "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1202)), - ), - ( - "patterns".to_string(), - FieldValue::Reference(DeclarationId(1199)), - ), - ( - "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1200)), - ), - ( - "values".to_string(), - FieldValue::Reference(DeclarationId(1201)), -======= - FieldValue::Reference(DeclarationId(1190)), - ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1191)), + FieldValue::Reference(DeclarationId(1193)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1192)), + FieldValue::Reference(DeclarationId(1194)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1193)), + FieldValue::Reference(DeclarationId(1195)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1194)), + FieldValue::Reference(DeclarationId(1196)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1195)), + FieldValue::Reference(DeclarationId(1197)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1196)), + FieldValue::Reference(DeclarationId(1198)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1197)), + FieldValue::Reference(DeclarationId(1199)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1201)), + FieldValue::Reference(DeclarationId(1203)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1198)), + FieldValue::Reference(DeclarationId(1200)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1199)), + FieldValue::Reference(DeclarationId(1201)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1200)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1202)), ), ], }), @@ -41857,11 +36360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 31152, 31571), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1204), -======= - id: DeclarationId(1203), ->>>>>>> origin/main + id: DeclarationId(1205), name: Some("go_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(831), @@ -41897,11 +36396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33238, 33374), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1205), -======= - id: DeclarationId(1204), ->>>>>>> origin/main + id: DeclarationId(1206), name: Some("go_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(822), @@ -41917,87 +36412,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1805), -======= - constructor: DeclarationId(1804), ->>>>>>> origin/main + constructor: DeclarationId(1806), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1808), -======= - constructor: DeclarationId(1807), ->>>>>>> origin/main + constructor: DeclarationId(1809), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1811), -======= - constructor: DeclarationId(1810), ->>>>>>> origin/main + constructor: DeclarationId(1812), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1814), -======= - constructor: DeclarationId(1813), ->>>>>>> origin/main + constructor: DeclarationId(1815), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1818), -======= - constructor: DeclarationId(1817), ->>>>>>> origin/main + constructor: DeclarationId(1819), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1820), -======= - constructor: DeclarationId(1819), ->>>>>>> origin/main + constructor: DeclarationId(1821), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1824), -======= - constructor: DeclarationId(1823), ->>>>>>> origin/main + constructor: DeclarationId(1825), payload: vec![], }, ), ( "correction_style".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1204)), -======= - FieldValue::Reference(DeclarationId(1203)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "post_emit_verifier".to_string(), @@ -42023,11 +36486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1827), -======= - constructor: DeclarationId(1826), ->>>>>>> origin/main + constructor: DeclarationId(1828), payload: vec![], }, ), @@ -42040,11 +36499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33376, 33934), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1206), -======= - id: DeclarationId(1205), ->>>>>>> origin/main + id: DeclarationId(1207), name: Some("go_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(823), @@ -42059,19 +36514,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1203)), - ), - ( - "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1205)), -======= - FieldValue::Reference(DeclarationId(1202)), + FieldValue::Reference(DeclarationId(1204)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1204)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1206)), ), ], }), @@ -42080,11 +36527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/go.dag", 33936, 34060), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1207), -======= - id: DeclarationId(1206), ->>>>>>> origin/main + id: DeclarationId(1208), name: Some("python_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -42112,11 +36555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 1887, 2009), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1208), -======= - id: DeclarationId(1207), ->>>>>>> origin/main + id: DeclarationId(1209), name: Some("python_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -42150,11 +36589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2011, 2164), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1209), -======= - id: DeclarationId(1208), ->>>>>>> origin/main + id: DeclarationId(1210), name: Some("python_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -42199,11 +36634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2166, 2381), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1210), -======= - id: DeclarationId(1209), ->>>>>>> origin/main + id: DeclarationId(1211), name: Some("python_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -42235,11 +36666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2383, 2497), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1211), -======= - id: DeclarationId(1210), ->>>>>>> origin/main + id: DeclarationId(1212), name: Some("python_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -42261,11 +36688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2499, 2560), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1212), -======= - id: DeclarationId(1211), ->>>>>>> origin/main + id: DeclarationId(1213), name: Some("python_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -42311,11 +36734,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2562, 2869), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1213), -======= - id: DeclarationId(1212), ->>>>>>> origin/main + id: DeclarationId(1214), name: Some("python_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -42339,11 +36758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2871, 2970), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1214), -======= - id: DeclarationId(1213), ->>>>>>> origin/main + id: DeclarationId(1215), name: Some("python_type_definitions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -42391,11 +36806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 2972, 3303), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1215), -======= - id: DeclarationId(1214), ->>>>>>> origin/main + id: DeclarationId(1216), name: Some("python_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(926), @@ -42449,11 +36860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3305, 3635), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1216), -======= - id: DeclarationId(1215), ->>>>>>> origin/main + id: DeclarationId(1217), name: Some("python_collections".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), @@ -42519,11 +36926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 3637, 4026), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1217), -======= - id: DeclarationId(1216), ->>>>>>> origin/main + id: DeclarationId(1218), name: Some("python_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -42563,11 +36966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4028, 4280), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1218), -======= - id: DeclarationId(1217), ->>>>>>> origin/main + id: DeclarationId(1219), name: Some("python_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -42595,11 +36994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4483, 4602), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1219), -======= - id: DeclarationId(1218), ->>>>>>> origin/main + id: DeclarationId(1220), name: Some("python_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(932), @@ -42614,99 +37009,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1207)), - ), - ( - "expressions".to_string(), FieldValue::Reference(DeclarationId(1208)), ), - ( - "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1209)), - ), - ( - "literals".to_string(), - FieldValue::Reference(DeclarationId(1210)), - ), - ( - "modules".to_string(), - FieldValue::Reference(DeclarationId(1211)), - ), - ( - "functions".to_string(), - FieldValue::Reference(DeclarationId(1212)), - ), - ( - "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1213)), - ), - ( - "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1214)), - ), - ( - "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1218)), - ), - ( - "patterns".to_string(), - FieldValue::Reference(DeclarationId(1215)), - ), - ( - "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1216)), - ), - ( - "values".to_string(), - FieldValue::Reference(DeclarationId(1217)), -======= - FieldValue::Reference(DeclarationId(1206)), - ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1207)), + FieldValue::Reference(DeclarationId(1209)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1208)), + FieldValue::Reference(DeclarationId(1210)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1209)), + FieldValue::Reference(DeclarationId(1211)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1210)), + FieldValue::Reference(DeclarationId(1212)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1211)), + FieldValue::Reference(DeclarationId(1213)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1212)), + FieldValue::Reference(DeclarationId(1214)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1213)), + FieldValue::Reference(DeclarationId(1215)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1217)), + FieldValue::Reference(DeclarationId(1219)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1214)), + FieldValue::Reference(DeclarationId(1216)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1215)), + FieldValue::Reference(DeclarationId(1217)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1216)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1218)), ), ], }), @@ -42715,11 +37062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 4604, 5079), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1220), -======= - id: DeclarationId(1219), ->>>>>>> origin/main + id: DeclarationId(1221), name: Some("python_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -42735,22 +37078,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1869), -======= - constructor: DeclarationId(1868), ->>>>>>> origin/main + constructor: DeclarationId(1870), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1872), -======= - constructor: DeclarationId(1871), ->>>>>>> origin/main + constructor: DeclarationId(1873), payload: vec![], }, ), @@ -42761,11 +37096,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5081, 5178), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1221), -======= - id: DeclarationId(1220), ->>>>>>> origin/main + id: DeclarationId(1222), name: Some("python_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(859), @@ -42793,11 +37124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5180, 5316), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1222), -======= - id: DeclarationId(1221), ->>>>>>> origin/main + id: DeclarationId(1223), name: Some("python_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(861), @@ -42818,11 +37145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5318, 5397), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1223), -======= - id: DeclarationId(1222), ->>>>>>> origin/main + id: DeclarationId(1224), name: Some("python_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42837,11 +37160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -42864,11 +37183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5399, 5535), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1224), -======= - id: DeclarationId(1223), ->>>>>>> origin/main + id: DeclarationId(1225), name: Some("python_integer_inhabit_at_i32_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -42883,11 +37198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "kernel_integer".to_string(), @@ -42900,27 +37211,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1928), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1598), - payload: vec![ - FieldValue::Literal(LiteralBits::Int(-2147483648)), - FieldValue::Variant { - constructor: DeclarationId(1597), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1595), -======= - constructor: DeclarationId(1927), + constructor: DeclarationId(1929), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1597), + constructor: DeclarationId(1599), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1596), + constructor: DeclarationId(1598), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1594), ->>>>>>> origin/main + constructor: DeclarationId(1596), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -42932,11 +37231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1223)), -======= - FieldValue::Reference(DeclarationId(1222)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1224)), ), ], }), @@ -42945,11 +37240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 5628, 5937), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1225), -======= - id: DeclarationId(1224), ->>>>>>> origin/main + id: DeclarationId(1226), name: Some("python_integer_inhabit_unbounded_decl".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -42964,7 +37255,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ( "kernel_integer".to_string(), @@ -42977,16 +37268,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1927), + constructor: DeclarationId(1929), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1598), + constructor: DeclarationId(1600), payload: vec![], }], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1222)), + FieldValue::Reference(DeclarationId(1224)), ), ], }), @@ -42995,7 +37286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6225), }); declarations.push(Declaration { - id: DeclarationId(1225), + id: DeclarationId(1227), name: Some("python_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43010,57 +37301,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), - ), - ( - "kernel_integer".to_string(), - FieldValue::Reference(DeclarationId(81)), - ), - ( - "algebra".to_string(), - FieldValue::Reference(DeclarationId(81)), - ), - ( - "bound".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1928), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1599), - payload: vec![], - }], - }, - ), - ( - "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1223)), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 6015, 6225), - }); - declarations.push(Declaration { - id: DeclarationId(1226), - name: Some("python_bool".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(897), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(897)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43083,11 +37324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6227, 6366), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1227), -======= - id: DeclarationId(1226), ->>>>>>> origin/main + id: DeclarationId(1228), name: Some("python_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43102,11 +37339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43129,11 +37362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6368, 6510), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1228), -======= - id: DeclarationId(1227), ->>>>>>> origin/main + id: DeclarationId(1229), name: Some("python_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43148,11 +37377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43175,11 +37400,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6512, 6658), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1229), -======= - id: DeclarationId(1228), ->>>>>>> origin/main + id: DeclarationId(1230), name: Some("python_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43194,11 +37415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43221,11 +37438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6660, 6806), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1230), -======= - id: DeclarationId(1229), ->>>>>>> origin/main + id: DeclarationId(1231), name: Some("python_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43240,11 +37453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43267,11 +37476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6808, 6975), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1231), -======= - id: DeclarationId(1230), ->>>>>>> origin/main + id: DeclarationId(1232), name: Some("python_declaration_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43286,19 +37491,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1086)), -======= - FieldValue::Reference(DeclarationId(1218)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1085)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1087)), ), ( "carrier".to_string(), @@ -43317,11 +37514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 6977, 7146), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1232), -======= - id: DeclarationId(1231), ->>>>>>> origin/main + id: DeclarationId(1233), name: Some("python_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43336,11 +37529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43363,11 +37552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7148, 7307), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1233), -======= - id: DeclarationId(1232), ->>>>>>> origin/main + id: DeclarationId(1234), name: Some("python_dag_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43382,11 +37567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43409,11 +37590,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7309, 7459), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1234), -======= - id: DeclarationId(1233), ->>>>>>> origin/main + id: DeclarationId(1235), name: Some("python_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43428,11 +37605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43455,11 +37628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7461, 7620), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1235), -======= - id: DeclarationId(1234), ->>>>>>> origin/main + id: DeclarationId(1236), name: Some("python_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43474,11 +37643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43501,11 +37666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7622, 7778), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1236), -======= - id: DeclarationId(1235), ->>>>>>> origin/main + id: DeclarationId(1237), name: Some("python_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43520,11 +37681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43547,11 +37704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7780, 7948), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1237), -======= - id: DeclarationId(1236), ->>>>>>> origin/main + id: DeclarationId(1238), name: Some("python_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43566,11 +37719,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43593,11 +37742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 7950, 8109), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1238), -======= - id: DeclarationId(1237), ->>>>>>> origin/main + id: DeclarationId(1239), name: Some("python_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43612,11 +37757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43639,11 +37780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8111, 8264), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1239), -======= - id: DeclarationId(1238), ->>>>>>> origin/main + id: DeclarationId(1240), name: Some("python_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43658,11 +37795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43685,11 +37818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8266, 8419), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1240), -======= - id: DeclarationId(1239), ->>>>>>> origin/main + id: DeclarationId(1241), name: Some("python_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43704,11 +37833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43731,11 +37856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8421, 8573), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1241), -======= - id: DeclarationId(1240), ->>>>>>> origin/main + id: DeclarationId(1242), name: Some("python_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43750,11 +37871,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43777,11 +37894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8575, 8712), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1242), -======= - id: DeclarationId(1241), ->>>>>>> origin/main + id: DeclarationId(1243), name: Some("python_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43796,11 +37909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43824,11 +37933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -43848,11 +37953,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 8786, 9035), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1243), -======= - id: DeclarationId(1242), ->>>>>>> origin/main + id: DeclarationId(1244), name: Some("python_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43867,11 +37968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43894,11 +37991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9037, 9199), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1244), -======= - id: DeclarationId(1243), ->>>>>>> origin/main + id: DeclarationId(1245), name: Some("python_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -43913,11 +38006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -43942,11 +38031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -43965,11 +38050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -43990,11 +38071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -44015,11 +38092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9201, 9607), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1245), -======= - id: DeclarationId(1244), ->>>>>>> origin/main + id: DeclarationId(1246), name: Some("python_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44034,11 +38107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44063,11 +38132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44086,11 +38151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -44111,11 +38172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9609, 9926), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1246), -======= - id: DeclarationId(1245), ->>>>>>> origin/main + id: DeclarationId(1247), name: Some("python_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44130,11 +38187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44159,11 +38212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44182,11 +38231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -44205,11 +38250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44230,11 +38271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 9928, 10338), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1247), -======= - id: DeclarationId(1246), ->>>>>>> origin/main + id: DeclarationId(1248), name: Some("python_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44249,11 +38286,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44276,11 +38309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10340, 10511), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1248), -======= - id: DeclarationId(1247), ->>>>>>> origin/main + id: DeclarationId(1249), name: Some("python_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44295,11 +38324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44322,11 +38347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10513, 10675), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1249), -======= - id: DeclarationId(1248), ->>>>>>> origin/main + id: DeclarationId(1250), name: Some("python_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44341,11 +38362,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44370,11 +38387,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44393,11 +38406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -44416,11 +38425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44441,11 +38446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 10677, 11096), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1250), -======= - id: DeclarationId(1249), ->>>>>>> origin/main + id: DeclarationId(1251), name: Some("python_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44460,11 +38461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44489,11 +38486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -44514,11 +38507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -44537,11 +38526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -44560,11 +38545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44585,11 +38566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11098, 11591), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1251), -======= - id: DeclarationId(1250), ->>>>>>> origin/main + id: DeclarationId(1252), name: Some("python_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44604,11 +38581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44633,11 +38606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -44656,11 +38625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -44679,11 +38644,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44704,11 +38665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 11593, 12007), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1252), -======= - id: DeclarationId(1251), ->>>>>>> origin/main + id: DeclarationId(1253), name: Some("python_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44723,11 +38680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44752,11 +38705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -44775,11 +38724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -44798,11 +38743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -44823,11 +38764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12009, 12435), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1253), -======= - id: DeclarationId(1252), ->>>>>>> origin/main + id: DeclarationId(1254), name: Some("python_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44842,11 +38779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44869,11 +38802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12437, 12608), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1254), -======= - id: DeclarationId(1253), ->>>>>>> origin/main + id: DeclarationId(1255), name: Some("python_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44888,11 +38817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44915,11 +38840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12610, 12781), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1255), -======= - id: DeclarationId(1254), ->>>>>>> origin/main + id: DeclarationId(1256), name: Some("python_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44934,11 +38855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -44961,11 +38878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12783, 12945), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1256), -======= - id: DeclarationId(1255), ->>>>>>> origin/main + id: DeclarationId(1257), name: Some("python_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -44980,11 +38893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45003,11 +38912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 12947, 13096), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1257), -======= - id: DeclarationId(1256), ->>>>>>> origin/main + id: DeclarationId(1258), name: Some("python_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45022,11 +38927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45045,11 +38946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13098, 13247), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1258), -======= - id: DeclarationId(1257), ->>>>>>> origin/main + id: DeclarationId(1259), name: Some("python_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45064,11 +38961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45087,11 +38980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13249, 13398), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1259), -======= - id: DeclarationId(1258), ->>>>>>> origin/main + id: DeclarationId(1260), name: Some("python_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45106,11 +38995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45131,11 +39016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13400, 13559), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1260), -======= - id: DeclarationId(1259), ->>>>>>> origin/main + id: DeclarationId(1261), name: Some("python_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45150,11 +39031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45173,11 +39050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13561, 13709), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1261), -======= - id: DeclarationId(1260), ->>>>>>> origin/main + id: DeclarationId(1262), name: Some("python_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45192,11 +39065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45215,11 +39084,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13711, 13866), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1262), -======= - id: DeclarationId(1261), ->>>>>>> origin/main + id: DeclarationId(1263), name: Some("python_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45234,11 +39099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45257,11 +39118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 13868, 14023), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1263), -======= - id: DeclarationId(1262), ->>>>>>> origin/main + id: DeclarationId(1264), name: Some("python_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45276,11 +39133,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45299,11 +39152,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14025, 14194), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1264), -======= - id: DeclarationId(1263), ->>>>>>> origin/main + id: DeclarationId(1265), name: Some("python_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45318,11 +39167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45341,11 +39186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14196, 14344), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1265), -======= - id: DeclarationId(1264), ->>>>>>> origin/main + id: DeclarationId(1266), name: Some("python_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45360,11 +39201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45383,11 +39220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14346, 14493), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1266), -======= - id: DeclarationId(1265), ->>>>>>> origin/main + id: DeclarationId(1267), name: Some("python_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45402,11 +39235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45425,11 +39254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14495, 14643), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1267), -======= - id: DeclarationId(1266), ->>>>>>> origin/main + id: DeclarationId(1268), name: Some("python_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45444,11 +39269,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45467,11 +39288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14645, 14792), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1268), -======= - id: DeclarationId(1267), ->>>>>>> origin/main + id: DeclarationId(1269), name: Some("python_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45486,11 +39303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45509,11 +39322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14794, 14942), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1269), -======= - id: DeclarationId(1268), ->>>>>>> origin/main + id: DeclarationId(1270), name: Some("python_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45528,11 +39337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45551,11 +39356,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 14944, 15102), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1270), -======= - id: DeclarationId(1269), ->>>>>>> origin/main + id: DeclarationId(1271), name: Some("python_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -45570,11 +39371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45593,11 +39390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15104, 15261), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1271), -======= - id: DeclarationId(1270), ->>>>>>> origin/main + id: DeclarationId(1272), name: Some("python_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -45612,11 +39405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45625,11 +39414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1942), -======= - constructor: DeclarationId(1941), ->>>>>>> origin/main + constructor: DeclarationId(1943), payload: vec![], }, ), @@ -45642,11 +39427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15263, 15409), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1272), -======= - id: DeclarationId(1271), ->>>>>>> origin/main + id: DeclarationId(1273), name: Some("python_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -45661,11 +39442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45674,10 +39451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1943), -======= - constructor: DeclarationId(1942), + constructor: DeclarationId(1944), payload: vec![], }, ), @@ -45688,7 +39462,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -45702,7 +39476,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15411, 15611), }); declarations.push(Declaration { - id: DeclarationId(1272), + id: DeclarationId(1274), name: Some("python_cons_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -45717,7 +39491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45726,7 +39500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1943), + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -45738,7 +39512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -45748,7 +39522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -45763,7 +39537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15613, 15838), }); declarations.push(Declaration { - id: DeclarationId(1273), + id: DeclarationId(1275), name: Some("python_concat_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -45778,7 +39552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45787,7 +39561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1944), + constructor: DeclarationId(1946), payload: vec![], }, ), @@ -45799,7 +39573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -45809,7 +39583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -45824,7 +39598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 15840, 16071), }); declarations.push(Declaration { - id: DeclarationId(1274), + id: DeclarationId(1276), name: Some("python_length_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -45839,7 +39613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -45848,8 +39622,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1945), ->>>>>>> origin/main + constructor: DeclarationId(1947), payload: vec![], }, ), @@ -45871,188 +39644,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/python.dag", 15411, 15611), - }); - declarations.push(Declaration { - id: DeclarationId(1273), - name: Some("python_cons_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1219)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(608)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1944), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 15613, 15838), - }); - declarations.push(Declaration { - id: DeclarationId(1274), - name: Some("python_concat_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1219)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(618)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1945), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1933), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 15840, 16071), - }); - declarations.push(Declaration { - id: DeclarationId(1275), - name: Some("python_length_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1219)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(628)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1946), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ])]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 16073, 16264), }); declarations.push(Declaration { - id: DeclarationId(1276), -======= - span: SourceSpan::new("src/v3/spec/python.dag", 16073, 16264), - }); - declarations.push(Declaration { - id: DeclarationId(1275), ->>>>>>> origin/main + id: DeclarationId(1277), name: Some("python_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -46067,11 +39662,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46080,11 +39671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1947), -======= - constructor: DeclarationId(1946), ->>>>>>> origin/main + constructor: DeclarationId(1948), payload: vec![], }, ), @@ -46095,11 +39682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46113,11 +39696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16266, 16462), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1277), -======= - id: DeclarationId(1276), ->>>>>>> origin/main + id: DeclarationId(1278), name: Some("python_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -46132,11 +39711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46145,9 +39720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD -======= - constructor: DeclarationId(1947), + constructor: DeclarationId(1949), payload: vec![], }, ), @@ -46159,7 +39732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1931), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46169,7 +39742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -46179,7 +39752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1931), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46194,7 +39767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 16464, 16729), }); declarations.push(Declaration { - id: DeclarationId(1277), + id: DeclarationId(1279), name: Some("python_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -46209,7 +39782,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46218,8 +39791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { ->>>>>>> origin/main - constructor: DeclarationId(1948), + constructor: DeclarationId(1950), payload: vec![], }, ), @@ -46231,11 +39803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46245,25 +39813,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD constructor: DeclarationId(1933), payload: vec![], }, ), ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(2))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), ]), ), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), @@ -46271,19 +39825,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/python.dag", 16464, 16729), - }); - declarations.push(Declaration { - id: DeclarationId(1278), - name: Some("python_map_callable".to_string()), -======= span: SourceSpan::new("src/v3/spec/python.dag", 16731, 16953), }); declarations.push(Declaration { - id: DeclarationId(1278), + id: DeclarationId(1280), name: Some("python_filter_callable".to_string()), ->>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -46297,24 +39843,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(620)), -======= - FieldValue::Reference(DeclarationId(1218)), + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), FieldValue::Reference(DeclarationId(623)), ->>>>>>> origin/main ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -46326,11 +39864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46340,11 +39874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46356,113 +39886,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/python.dag", 16731, 16953), - }); - declarations.push(Declaration { - id: DeclarationId(1279), - name: Some("python_filter_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), -======= span: SourceSpan::new("src/v3/spec/python.dag", 16955, 17186), }); declarations.push(Declaration { - id: DeclarationId(1279), + id: DeclarationId(1281), name: Some("python_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), ->>>>>>> origin/main arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(904)), -======= meta_tag: Some(DeclarationId(905)), ->>>>>>> origin/main - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(623)), -======= - FieldValue::Reference(DeclarationId(1218)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(638)), ->>>>>>> origin/main - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1950), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 16955, 17186), - }); - declarations.push(Declaration { - id: DeclarationId(1280), - name: Some("python_contains_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1219)), + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46471,7 +39913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1951), + constructor: DeclarationId(1952), payload: vec![], }, ), @@ -46483,7 +39925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46493,10 +39935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -46511,11 +39950,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 17188, 17425), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1281), -======= - id: DeclarationId(1280), ->>>>>>> origin/main + id: DeclarationId(1282), name: Some("python_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -46530,11 +39965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46551,15 +39982,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17427, 17575), }); -<<<<<<< HEAD - declarations.push(Declaration { id: DeclarationId(1282), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(911), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(911)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1219))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) }); + declarations.push(Declaration { id: DeclarationId(1283), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(912)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1220))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) }); declarations.push(Declaration { - id: DeclarationId(1283), -======= - declarations.push(Declaration { id: DeclarationId(1281), name: Some("python_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(912)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("language".to_string(), FieldValue::Reference(DeclarationId(1218))), ("target".to_string(), FieldValue::Reference(DeclarationId(11))), ("carrier".to_string(), FieldValue::Literal(LiteralBits::String("typing.Union[typing.Tuple[typing.Literal['Ok'], {key}], typing.Tuple[typing.Literal['Err'], {value}]]".to_string()))), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1)))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/python.dag", 17691, 17929) }); - declarations.push(Declaration { - id: DeclarationId(1282), ->>>>>>> origin/main + id: DeclarationId(1284), name: Some("python_non_empty_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -46574,11 +39999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46598,11 +40019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18020, 18194), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1284), -======= - id: DeclarationId(1283), ->>>>>>> origin/main + id: DeclarationId(1285), name: Some("python_non_singleton_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -46617,11 +40034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46641,11 +40054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18196, 18382), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1285), -======= - id: DeclarationId(1284), ->>>>>>> origin/main + id: DeclarationId(1286), name: Some("python_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(914), @@ -46660,11 +40069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), -======= - FieldValue::Reference(DeclarationId(1218)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1220)), ), ( "target".to_string(), @@ -46673,29 +40078,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1953), -======= - constructor: DeclarationId(1952), ->>>>>>> origin/main + constructor: DeclarationId(1954), payload: vec![], }, ), ( "empty_variant".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1504)), - ), - ( - "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1506)), -======= - FieldValue::Reference(DeclarationId(1503)), + FieldValue::Reference(DeclarationId(1505)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1505)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1507)), ), ( "scrutinee".to_string(), @@ -46725,11 +40118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 18383, 18697), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1286), -======= - id: DeclarationId(1285), ->>>>>>> origin/main + id: DeclarationId(1287), name: Some("python_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(831), @@ -46765,11 +40154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 20762, 20904), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1287), -======= - id: DeclarationId(1286), ->>>>>>> origin/main + id: DeclarationId(1288), name: Some("python_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(822), @@ -46785,87 +40170,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1805), -======= - constructor: DeclarationId(1804), ->>>>>>> origin/main + constructor: DeclarationId(1806), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1810), -======= - constructor: DeclarationId(1809), ->>>>>>> origin/main + constructor: DeclarationId(1811), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1811), -======= - constructor: DeclarationId(1810), ->>>>>>> origin/main + constructor: DeclarationId(1812), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1814), -======= - constructor: DeclarationId(1813), ->>>>>>> origin/main + constructor: DeclarationId(1815), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1818), -======= - constructor: DeclarationId(1817), ->>>>>>> origin/main + constructor: DeclarationId(1819), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1819), -======= - constructor: DeclarationId(1818), ->>>>>>> origin/main + constructor: DeclarationId(1820), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1824), -======= - constructor: DeclarationId(1823), ->>>>>>> origin/main + constructor: DeclarationId(1825), payload: vec![], }, ), ( "correction_style".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1286)), -======= - FieldValue::Reference(DeclarationId(1285)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1287)), ), ( "post_emit_verifier".to_string(), @@ -46894,11 +40247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1826), -======= - constructor: DeclarationId(1825), ->>>>>>> origin/main + constructor: DeclarationId(1827), payload: vec![], }, ), @@ -46911,11 +40260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 20906, 21486), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1288), -======= - id: DeclarationId(1287), ->>>>>>> origin/main + id: DeclarationId(1289), name: Some("python_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(823), @@ -46930,19 +40275,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1219)), + FieldValue::Reference(DeclarationId(1220)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1287)), -======= - FieldValue::Reference(DeclarationId(1218)), - ), - ( - "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1286)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1288)), ), ], }), @@ -46951,11 +40288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/python.dag", 21488, 21624), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1289), -======= - id: DeclarationId(1288), ->>>>>>> origin/main + id: DeclarationId(1290), name: Some("rust_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -46971,22 +40304,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "memory".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1871), -======= - constructor: DeclarationId(1870), ->>>>>>> origin/main + constructor: DeclarationId(1872), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1872), -======= - constructor: DeclarationId(1871), ->>>>>>> origin/main + constructor: DeclarationId(1873), payload: vec![], }, ), @@ -46997,11 +40322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4448, 4550), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1290), -======= - id: DeclarationId(1289), ->>>>>>> origin/main + id: DeclarationId(1291), name: Some("rust_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(859), @@ -47031,11 +40352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4552, 4704), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1291), -======= - id: DeclarationId(1290), ->>>>>>> origin/main + id: DeclarationId(1292), name: Some("rust_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(861), @@ -47056,11 +40373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 4706, 4781), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1292), -======= - id: DeclarationId(1291), ->>>>>>> origin/main + id: DeclarationId(1293), name: Some("rust_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47075,11 +40388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47102,11 +40411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5232, 5364), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1293), -======= - id: DeclarationId(1292), ->>>>>>> origin/main + id: DeclarationId(1294), name: Some("rust_uint8".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47121,11 +40426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47148,11 +40449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5366, 5501), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1294), -======= - id: DeclarationId(1293), ->>>>>>> origin/main + id: DeclarationId(1295), name: Some("rust_i32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47167,11 +40464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47194,11 +40487,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5503, 5637), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1295), -======= - id: DeclarationId(1294), ->>>>>>> origin/main + id: DeclarationId(1296), name: Some("rust_u32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47213,11 +40502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47240,11 +40525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5639, 5774), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1296), -======= - id: DeclarationId(1295), ->>>>>>> origin/main + id: DeclarationId(1297), name: Some("rust_i128".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47259,11 +40540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47286,11 +40563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 5776, 5913), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1297), -======= - id: DeclarationId(1296), ->>>>>>> origin/main + id: DeclarationId(1298), name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -47305,11 +40578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "kernel_integer".to_string(), @@ -47322,26 +40591,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1928), + constructor: DeclarationId(1929), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1598), - payload: vec![ - FieldValue::Literal(LiteralBits::Int(0)), - FieldValue::Variant { - constructor: DeclarationId(1597), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1595), -======= - constructor: DeclarationId(1927), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1597), + constructor: DeclarationId(1599), payload: vec![ FieldValue::Literal(LiteralBits::Int(0)), FieldValue::Variant { - constructor: DeclarationId(1596), + constructor: DeclarationId(1598), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1594), + constructor: DeclarationId(1596), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -47353,7 +40611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1294)), + FieldValue::Reference(DeclarationId(1296)), ), ], }), @@ -47362,7 +40620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6334, 6633), }); declarations.push(Declaration { - id: DeclarationId(1297), + id: DeclarationId(1299), name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -47377,7 +40635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "kernel_integer".to_string(), @@ -47390,16 +40648,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1927), + constructor: DeclarationId(1929), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1597), + constructor: DeclarationId(1599), payload: vec![ FieldValue::Literal(LiteralBits::Int(-2147483648)), FieldValue::Variant { - constructor: DeclarationId(1596), + constructor: DeclarationId(1598), payload: vec![FieldValue::Variant { - constructor: DeclarationId(1594), ->>>>>>> origin/main + constructor: DeclarationId(1596), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -47420,12 +40677,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6635, 6942), }); declarations.push(Declaration { - id: DeclarationId(1298), -<<<<<<< HEAD - name: Some("rust_integer_inhabit_i32_at_program_bound".to_string()), -======= + id: DeclarationId(1300), name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()), ->>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(899), arguments: vec![], @@ -47439,11 +40692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "kernel_integer".to_string(), @@ -47456,78 +40705,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD constructor: DeclarationId(1928), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1598), - payload: vec![ - FieldValue::Literal(LiteralBits::Int(-2147483648)), - FieldValue::Variant { - constructor: DeclarationId(1597), - payload: vec![FieldValue::Variant { - constructor: DeclarationId(1595), - payload: vec![FieldValue::Literal(LiteralBits::Int( - 4294967295, - ))], - }], - }, - ], - }], - }, - ), - ( - "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1294)), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 6635, 6942), - }); - declarations.push(Declaration { - id: DeclarationId(1299), - name: Some("rust_integer_inhabit_i32_bound_unspecified".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(898), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(898)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "kernel_integer".to_string(), - FieldValue::Reference(DeclarationId(73)), - ), - ( - "algebra".to_string(), - FieldValue::Reference(DeclarationId(73)), - ), - ( - "bound".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1927), -======= - constructor: DeclarationId(1926), ->>>>>>> origin/main payload: vec![], }, ), ( "type_realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1294)), -======= - FieldValue::Reference(DeclarationId(1293)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1295)), ), ], }), @@ -47536,11 +40720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 6944, 7149), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1300), -======= - id: DeclarationId(1299), ->>>>>>> origin/main + id: DeclarationId(1301), name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -47555,11 +40735,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "kernel_integer".to_string(), @@ -47572,21 +40748,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1927), -======= - constructor: DeclarationId(1926), ->>>>>>> origin/main + constructor: DeclarationId(1928), payload: vec![], }, ), ( "type_realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1292)), -======= - FieldValue::Reference(DeclarationId(1291)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1293)), ), ], }), @@ -47595,11 +40763,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7151, 7354), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1301), -======= - id: DeclarationId(1300), ->>>>>>> origin/main + id: DeclarationId(1302), name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -47614,7 +40778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "kernel_integer".to_string(), @@ -47627,13 +40791,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "bound".to_string(), FieldValue::Variant { - constructor: DeclarationId(1926), + constructor: DeclarationId(1928), payload: vec![], }, ), ( "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1295)), + FieldValue::Reference(DeclarationId(1297)), ), ], }), @@ -47642,7 +40806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7356, 7565), }); declarations.push(Declaration { - id: DeclarationId(1301), + id: DeclarationId(1303), name: Some("rust_bool".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47657,54 +40821,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "kernel_integer".to_string(), - FieldValue::Reference(DeclarationId(75)), - ), - ( - "algebra".to_string(), - FieldValue::Reference(DeclarationId(75)), - ), - ( - "bound".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1927), - payload: vec![], - }, - ), - ( - "type_realization".to_string(), - FieldValue::Reference(DeclarationId(1296)), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 7356, 7565), - }); - declarations.push(Declaration { - id: DeclarationId(1302), - name: Some("rust_bool".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(897), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(897)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47727,11 +40844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7567, 7702), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1303), -======= - id: DeclarationId(1302), ->>>>>>> origin/main + id: DeclarationId(1304), name: Some("rust_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47746,11 +40859,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47773,11 +40882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7704, 7846), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1304), -======= - id: DeclarationId(1303), ->>>>>>> origin/main + id: DeclarationId(1305), name: Some("rust_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47792,11 +40897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47819,11 +40920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7848, 7990), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1305), -======= - id: DeclarationId(1304), ->>>>>>> origin/main + id: DeclarationId(1306), name: Some("rust_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47838,11 +40935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47865,11 +40958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 7992, 8134), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1306), -======= - id: DeclarationId(1305), ->>>>>>> origin/main + id: DeclarationId(1307), name: Some("rust_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47884,11 +40973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47911,11 +40996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8136, 8299), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1307), -======= - id: DeclarationId(1306), ->>>>>>> origin/main + id: DeclarationId(1308), name: Some("rust_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47930,11 +41011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -47957,11 +41034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8301, 8452), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1308), -======= - id: DeclarationId(1307), ->>>>>>> origin/main + id: DeclarationId(1309), name: Some("rust_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47976,11 +41049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48004,11 +41073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -48028,11 +41093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8454, 8699), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1309), -======= - id: DeclarationId(1308), ->>>>>>> origin/main + id: DeclarationId(1310), name: Some("rust_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48047,11 +41108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48074,11 +41131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8701, 8853), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1310), -======= - id: DeclarationId(1309), ->>>>>>> origin/main + id: DeclarationId(1311), name: Some("rust_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48093,11 +41146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48122,11 +41171,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48145,11 +41190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -48170,11 +41211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -48195,11 +41232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 8855, 9251), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1311), -======= - id: DeclarationId(1310), ->>>>>>> origin/main + id: DeclarationId(1312), name: Some("rust_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48214,11 +41247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48243,11 +41272,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -48266,11 +41291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -48289,11 +41310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -48314,11 +41331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9253, 9651), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1312), -======= - id: DeclarationId(1311), ->>>>>>> origin/main + id: DeclarationId(1313), name: Some("rust_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48333,11 +41346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48360,11 +41369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9653, 9811), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1313), -======= - id: DeclarationId(1312), ->>>>>>> origin/main + id: DeclarationId(1314), name: Some("rust_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48379,11 +41384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48406,11 +41407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9813, 9971), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1314), -======= - id: DeclarationId(1313), ->>>>>>> origin/main + id: DeclarationId(1315), name: Some("rust_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48425,11 +41422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48452,11 +41445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 9973, 10146), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1315), -======= - id: DeclarationId(1314), ->>>>>>> origin/main + id: DeclarationId(1316), name: Some("rust_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48471,11 +41460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48498,11 +41483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10148, 10296), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1316), -======= - id: DeclarationId(1315), ->>>>>>> origin/main + id: DeclarationId(1317), name: Some("rust_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48517,11 +41498,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48546,11 +41523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10298, 10487), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1317), -======= - id: DeclarationId(1316), ->>>>>>> origin/main + id: DeclarationId(1318), name: Some("rust_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48565,11 +41538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48592,11 +41561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10489, 10653), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1318), -======= - id: DeclarationId(1317), ->>>>>>> origin/main + id: DeclarationId(1319), name: Some("rust_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48611,11 +41576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48640,11 +41601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -48663,11 +41620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -48688,11 +41641,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10655, 10957), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1319), -======= - id: DeclarationId(1318), ->>>>>>> origin/main + id: DeclarationId(1320), name: Some("rust_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48707,11 +41656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48738,11 +41683,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -48761,11 +41702,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -48786,11 +41723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 10959, 11300), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1320), -======= - id: DeclarationId(1319), ->>>>>>> origin/main + id: DeclarationId(1321), name: Some("rust_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48805,11 +41738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48836,11 +41765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -48859,11 +41784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -48884,11 +41805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11302, 11647), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1321), -======= - id: DeclarationId(1320), ->>>>>>> origin/main + id: DeclarationId(1322), name: Some("rust_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48903,11 +41820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -48933,11 +41846,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -48957,11 +41866,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11649, 11925), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1322), -======= - id: DeclarationId(1321), ->>>>>>> origin/main + id: DeclarationId(1323), name: Some("rust_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48976,11 +41881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49007,11 +41908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -49030,11 +41927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -49055,11 +41948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 11927, 12244), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1323), -======= - id: DeclarationId(1322), ->>>>>>> origin/main + id: DeclarationId(1324), name: Some("rust_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49074,11 +41963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49103,11 +41988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -49126,11 +42007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -49151,11 +42028,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12246, 12566), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1324), -======= - id: DeclarationId(1323), ->>>>>>> origin/main + id: DeclarationId(1325), name: Some("rust_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49170,11 +42043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49199,11 +42068,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -49222,11 +42087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -49245,11 +42106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -49270,11 +42127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12568, 12981), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1325), -======= - id: DeclarationId(1324), ->>>>>>> origin/main + id: DeclarationId(1326), name: Some("rust_element_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49289,11 +42142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49317,11 +42166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -49341,11 +42186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 12983, 13224), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1326), -======= - id: DeclarationId(1325), ->>>>>>> origin/main + id: DeclarationId(1327), name: Some("rust_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49360,11 +42201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49389,11 +42226,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -49412,11 +42245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -49437,11 +42266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13226, 13546), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1327), -======= - id: DeclarationId(1326), ->>>>>>> origin/main + id: DeclarationId(1328), name: Some("rust_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49456,11 +42281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49484,11 +42305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -49508,11 +42325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13548, 13793), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1328), -======= - id: DeclarationId(1327), ->>>>>>> origin/main + id: DeclarationId(1329), name: Some("rust_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49527,11 +42340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49555,11 +42364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -49579,11 +42384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 13795, 14040), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1329), -======= - id: DeclarationId(1328), ->>>>>>> origin/main + id: DeclarationId(1330), name: Some("rust_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49598,11 +42399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49626,11 +42423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -49650,11 +42443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14042, 14305), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1330), -======= - id: DeclarationId(1329), ->>>>>>> origin/main + id: DeclarationId(1331), name: Some("rust_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49669,11 +42458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49698,11 +42483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -49723,11 +42504,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -49748,11 +42525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14307, 14644), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1331), -======= - id: DeclarationId(1330), ->>>>>>> origin/main + id: DeclarationId(1332), name: Some("rust_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49767,11 +42540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49794,11 +42563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14646, 14801), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1332), -======= - id: DeclarationId(1331), ->>>>>>> origin/main + id: DeclarationId(1333), name: Some("rust_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49813,11 +42578,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49840,11 +42601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14803, 14955), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1333), -======= - id: DeclarationId(1332), ->>>>>>> origin/main + id: DeclarationId(1334), name: Some("rust_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49859,11 +42616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49886,11 +42639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 14957, 15109), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1334), -======= - id: DeclarationId(1333), ->>>>>>> origin/main + id: DeclarationId(1335), name: Some("rust_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49905,11 +42654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49932,11 +42677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15111, 15278), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1335), -======= - id: DeclarationId(1334), ->>>>>>> origin/main + id: DeclarationId(1336), name: Some("rust_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49951,11 +42692,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -49980,11 +42717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -50003,11 +42736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -50028,11 +42757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -50053,11 +42778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -50078,11 +42799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -50103,11 +42820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -50128,11 +42841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -50153,11 +42862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -50178,11 +42883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -50201,11 +42902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -50226,11 +42923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 15280, 16301), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1336), -======= - id: DeclarationId(1335), ->>>>>>> origin/main + id: DeclarationId(1337), name: Some("rust_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50245,11 +42938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50272,11 +42961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16303, 16464), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1337), -======= - id: DeclarationId(1336), ->>>>>>> origin/main + id: DeclarationId(1338), name: Some("rust_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50291,11 +42976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50318,11 +42999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16466, 16627), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1338), -======= - id: DeclarationId(1337), ->>>>>>> origin/main + id: DeclarationId(1339), name: Some("rust_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50337,11 +43014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50364,11 +43037,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16629, 16781), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1339), -======= - id: DeclarationId(1338), ->>>>>>> origin/main + id: DeclarationId(1340), name: Some("rust_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50383,11 +43052,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50410,11 +43075,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16783, 16944), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1340), -======= - id: DeclarationId(1339), ->>>>>>> origin/main + id: DeclarationId(1341), name: Some("rust_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50429,11 +43090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50456,11 +43113,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 16946, 17116), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1341), -======= - id: DeclarationId(1340), ->>>>>>> origin/main + id: DeclarationId(1342), name: Some("rust_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50475,11 +43128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50502,11 +43151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17118, 17282), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1342), -======= - id: DeclarationId(1341), ->>>>>>> origin/main + id: DeclarationId(1343), name: Some("rust_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50521,11 +43166,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50552,11 +43193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -50577,11 +43214,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -50602,11 +43235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17284, 17639), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1343), -======= - id: DeclarationId(1342), ->>>>>>> origin/main + id: DeclarationId(1344), name: Some("rust_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50621,11 +43250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50650,11 +43275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -50675,11 +43296,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -50698,11 +43315,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -50721,11 +43334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -50746,11 +43355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 17641, 18129), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1344), -======= - id: DeclarationId(1343), ->>>>>>> origin/main + id: DeclarationId(1345), name: Some("rust_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50765,11 +43370,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50792,11 +43393,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18131, 18283), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1345), -======= - id: DeclarationId(1344), ->>>>>>> origin/main + id: DeclarationId(1346), name: Some("rust_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50811,11 +43408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -50840,11 +43433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -50863,11 +43452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -50888,11 +43473,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -50911,11 +43492,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -50936,11 +43513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -50961,11 +43534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 18285, 19058), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1346), -======= - id: DeclarationId(1345), ->>>>>>> origin/main + id: DeclarationId(1347), name: Some("rust_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50980,11 +43549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -51009,11 +43574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -51032,11 +43593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -51055,11 +43612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -51080,11 +43633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -51103,11 +43652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51128,11 +43673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19060, 19632), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1347), -======= - id: DeclarationId(1346), ->>>>>>> origin/main + id: DeclarationId(1348), name: Some("rust_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -51147,11 +43688,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -51176,11 +43713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -51199,11 +43732,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -51222,11 +43751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -51247,11 +43772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -51270,11 +43791,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51295,11 +43812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -51320,11 +43833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 19634, 20301), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1348), -======= - id: DeclarationId(1347), ->>>>>>> origin/main + id: DeclarationId(1349), name: Some("rust_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -51339,11 +43848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -51368,11 +43873,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -51391,11 +43892,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -51414,11 +43911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -51437,11 +43930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -51460,11 +43949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -51485,11 +43970,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -51508,11 +43989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51533,11 +44010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 20303, 21012), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1349), -======= - id: DeclarationId(1348), ->>>>>>> origin/main + id: DeclarationId(1350), name: Some("rust_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -51552,11 +44025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -51581,11 +44050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -51604,11 +44069,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -51629,11 +44090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -51652,11 +44109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -51675,11 +44128,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -51700,11 +44149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -51725,11 +44170,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -51750,11 +44191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21014, 21774), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1350), -======= - id: DeclarationId(1349), ->>>>>>> origin/main + id: DeclarationId(1351), name: Some("rust_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -51769,11 +44206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -51796,11 +44229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21776, 21924), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1351), -======= - id: DeclarationId(1350), ->>>>>>> origin/main + id: DeclarationId(1352), name: Some("rust_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -51815,11 +44244,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -51846,11 +44271,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -51869,11 +44290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -51892,11 +44309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -51917,11 +44330,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1930), -======= - constructor: DeclarationId(1929), ->>>>>>> origin/main + constructor: DeclarationId(1931), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -51942,11 +44351,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 21926, 22406), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1352), -======= - id: DeclarationId(1351), ->>>>>>> origin/main + id: DeclarationId(1353), name: Some("rust_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -51961,11 +44366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -51991,11 +44392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "items".to_string(), ))], @@ -52015,11 +44412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22619, 22879), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1353), -======= - id: DeclarationId(1352), ->>>>>>> origin/main + id: DeclarationId(1354), name: Some("rust_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52034,11 +44427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52063,11 +44452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 22881, 23054), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1354), -======= - id: DeclarationId(1353), ->>>>>>> origin/main + id: DeclarationId(1355), name: Some("rust_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52082,11 +44467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52113,11 +44494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -52136,11 +44513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -52161,11 +44534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "refinement".to_string(), ))], @@ -52186,11 +44555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23056, 23473), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1355), -======= - id: DeclarationId(1354), ->>>>>>> origin/main + id: DeclarationId(1356), name: Some("rust_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52205,11 +44570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52236,11 +44597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -52259,11 +44616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -52284,11 +44637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23475, 23803), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1356), -======= - id: DeclarationId(1355), ->>>>>>> origin/main + id: DeclarationId(1357), name: Some("rust_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52303,11 +44652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52334,11 +44679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -52357,11 +44698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -52380,11 +44717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -52405,11 +44738,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 23805, 24226), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1357), -======= - id: DeclarationId(1356), ->>>>>>> origin/main + id: DeclarationId(1358), name: Some("rust_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52424,11 +44753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52453,11 +44778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24228, 24410), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1358), -======= - id: DeclarationId(1357), ->>>>>>> origin/main + id: DeclarationId(1359), name: Some("rust_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52472,11 +44793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52501,11 +44818,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24412, 24585), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1359), -======= - id: DeclarationId(1358), ->>>>>>> origin/main + id: DeclarationId(1360), name: Some("rust_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52520,11 +44833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52551,11 +44860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -52574,11 +44879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -52597,11 +44898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -52622,11 +44919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 24587, 25017), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1360), -======= - id: DeclarationId(1359), ->>>>>>> origin/main + id: DeclarationId(1361), name: Some("rust_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52641,11 +44934,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52672,11 +44961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "key".to_string(), ))], @@ -52697,11 +44982,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "key_span".to_string(), ))], @@ -52720,11 +45001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -52743,11 +45020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -52768,11 +45041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25019, 25523), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1361), -======= - id: DeclarationId(1360), ->>>>>>> origin/main + id: DeclarationId(1362), name: Some("rust_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52787,11 +45056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52818,11 +45083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -52841,11 +45102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -52864,11 +45121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -52889,11 +45142,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25525, 25950), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1362), -======= - id: DeclarationId(1361), ->>>>>>> origin/main + id: DeclarationId(1363), name: Some("rust_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -52908,11 +45157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -52939,11 +45184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -52962,11 +45203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -52985,11 +45222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1929), -======= - constructor: DeclarationId(1928), ->>>>>>> origin/main + constructor: DeclarationId(1930), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -53010,11 +45243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 25952, 26389), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1363), -======= - id: DeclarationId(1362), ->>>>>>> origin/main + id: DeclarationId(1364), name: Some("rust_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -53029,11 +45258,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53058,11 +45283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26391, 26573), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1364), -======= - id: DeclarationId(1363), ->>>>>>> origin/main + id: DeclarationId(1365), name: Some("rust_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -53077,11 +45298,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53106,11 +45323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26575, 26757), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1365), -======= - id: DeclarationId(1364), ->>>>>>> origin/main + id: DeclarationId(1366), name: Some("rust_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -53125,11 +45338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53154,11 +45363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 26759, 26932), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1366), -======= - id: DeclarationId(1365), ->>>>>>> origin/main + id: DeclarationId(1367), name: Some("rust_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53173,11 +45378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53196,11 +45397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27787, 27932), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1367), -======= - id: DeclarationId(1366), ->>>>>>> origin/main + id: DeclarationId(1368), name: Some("rust_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53215,11 +45412,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53238,11 +45431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 27934, 28079), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1368), -======= - id: DeclarationId(1367), ->>>>>>> origin/main + id: DeclarationId(1369), name: Some("rust_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53257,11 +45446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53280,11 +45465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28081, 28226), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1369), -======= - id: DeclarationId(1368), ->>>>>>> origin/main + id: DeclarationId(1370), name: Some("rust_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53299,11 +45480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53324,11 +45501,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28228, 28386), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1370), -======= - id: DeclarationId(1369), ->>>>>>> origin/main + id: DeclarationId(1371), name: Some("rust_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53343,11 +45516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53366,11 +45535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28836, 28980), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1371), -======= - id: DeclarationId(1370), ->>>>>>> origin/main + id: DeclarationId(1372), name: Some("rust_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53385,11 +45550,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53408,11 +45569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 28982, 29133), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1372), -======= - id: DeclarationId(1371), ->>>>>>> origin/main + id: DeclarationId(1373), name: Some("rust_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53427,11 +45584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53450,11 +45603,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29135, 29286), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1373), -======= - id: DeclarationId(1372), ->>>>>>> origin/main + id: DeclarationId(1374), name: Some("rust_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53469,11 +45618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53492,11 +45637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29288, 29453), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1374), -======= - id: DeclarationId(1373), ->>>>>>> origin/main + id: DeclarationId(1375), name: Some("rust_string_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53511,11 +45652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53534,11 +45671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29646, 29796), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1375), -======= - id: DeclarationId(1374), ->>>>>>> origin/main + id: DeclarationId(1376), name: Some("rust_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53553,11 +45686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53576,11 +45705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29798, 29942), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1376), -======= - id: DeclarationId(1375), ->>>>>>> origin/main + id: DeclarationId(1377), name: Some("rust_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53595,11 +45720,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53618,11 +45739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 29944, 30095), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1377), -======= - id: DeclarationId(1376), ->>>>>>> origin/main + id: DeclarationId(1378), name: Some("rust_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53637,11 +45754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53660,11 +45773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30097, 30248), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1378), -======= - id: DeclarationId(1377), ->>>>>>> origin/main + id: DeclarationId(1379), name: Some("rust_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53679,11 +45788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53702,11 +45807,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30250, 30415), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1379), -======= - id: DeclarationId(1378), ->>>>>>> origin/main + id: DeclarationId(1380), name: Some("rust_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53721,11 +45822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53744,11 +45841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30417, 30560), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1380), -======= - id: DeclarationId(1379), ->>>>>>> origin/main + id: DeclarationId(1381), name: Some("rust_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53763,11 +45856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53786,11 +45875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30562, 30706), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1381), -======= - id: DeclarationId(1380), ->>>>>>> origin/main + id: DeclarationId(1382), name: Some("rust_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53805,11 +45890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53828,11 +45909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30708, 30851), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1382), -======= - id: DeclarationId(1381), ->>>>>>> origin/main + id: DeclarationId(1383), name: Some("rust_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53847,11 +45924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53870,11 +45943,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30853, 30997), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1383), -======= - id: DeclarationId(1382), ->>>>>>> origin/main + id: DeclarationId(1384), name: Some("rust_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53889,11 +45958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53912,11 +45977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 30999, 31152), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1384), -======= - id: DeclarationId(1383), ->>>>>>> origin/main + id: DeclarationId(1385), name: Some("rust_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -53931,11 +45992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -53954,11 +46011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 31154, 31307), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1385), -======= - id: DeclarationId(1384), ->>>>>>> origin/main + id: DeclarationId(1386), name: Some("rust_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -53973,19 +46026,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1084)), -======= - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1083)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1085)), ), ( "carrier".to_string(), @@ -54001,11 +46046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32057, 32196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1386), -======= - id: DeclarationId(1385), ->>>>>>> origin/main + id: DeclarationId(1387), name: Some("rust_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -54020,19 +46061,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1082)), -======= - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(1081)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1083)), ), ( "carrier".to_string(), @@ -54048,11 +46081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 32198, 32345), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1387), -======= - id: DeclarationId(1386), ->>>>>>> origin/main + id: DeclarationId(1388), name: Some("rust_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -54060,214 +46089,36 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1085)), -======= - FieldValue::Reference(DeclarationId(1415)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(1084)), ->>>>>>> origin/main - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String( - "fn main() { {body} println!({quote}{{}}{quote}, {final}); }" - .to_string(), - )), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1388), -======= - id: DeclarationId(1387), ->>>>>>> origin/main - name: Some("rust_empty_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(905), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(905)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(606)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1942), -======= - constructor: DeclarationId(1941), ->>>>>>> origin/main - payload: vec![], - }, - ), - ("parameters".to_string(), FieldValue::List(vec![])), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 33894, 34036), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1389), -======= - id: DeclarationId(1388), ->>>>>>> origin/main - name: Some("rust_singleton_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(905), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(905)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(610)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1943), -======= - constructor: DeclarationId(1942), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ])]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 34038, 34234), - }); - declarations.push(Declaration { - id: DeclarationId(1389), - name: Some("rust_cons_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(905), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(905)), + meta_tag: Some(DeclarationId(904)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(608)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1943), - payload: vec![], - }, + FieldValue::Reference(DeclarationId(1086)), ), ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ]), - ]), + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String( + "fn main() { {body} println!({quote}{{}}{quote}, {final}); }" + .to_string(), + )), ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), + ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(0))), ], }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 34236, 34457), + span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517), }); declarations.push(Declaration { - id: DeclarationId(1390), - name: Some("rust_concat_callable".to_string()), + id: DeclarationId(1389), + name: Some("rust_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -54281,54 +46132,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(618)), + FieldValue::Reference(DeclarationId(606)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1944), + constructor: DeclarationId(1943), payload: vec![], }, ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ]), - ]), - ), + ("parameters".to_string(), FieldValue::List(vec![])), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), ], }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 34459, 34686), + span: SourceSpan::new("src/v3/spec/rust.dag", 33894, 34036), }); declarations.push(Declaration { - id: DeclarationId(1391), - name: Some("rust_length_callable".to_string()), + id: DeclarationId(1390), + name: Some("rust_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -54342,17 +46169,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(628)), + FieldValue::Reference(DeclarationId(610)), ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1945), ->>>>>>> origin/main + constructor: DeclarationId(1944), payload: vec![], }, ), @@ -54363,7 +46189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -54374,26 +46200,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD span: SourceSpan::new("src/v3/spec/rust.dag", 34038, 34234), }); declarations.push(Declaration { - id: DeclarationId(1390), + id: DeclarationId(1391), name: Some("rust_cons_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(904), + template: DeclarationId(905), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), + meta_tag: Some(DeclarationId(905)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54402,7 +46227,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1944), + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -54414,7 +46239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -54424,7 +46249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -54439,22 +46264,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34236, 34457), }); declarations.push(Declaration { - id: DeclarationId(1391), + id: DeclarationId(1392), name: Some("rust_concat_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(904), + template: DeclarationId(905), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), + meta_tag: Some(DeclarationId(905)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54463,7 +46288,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1945), + constructor: DeclarationId(1946), payload: vec![], }, ), @@ -54475,7 +46300,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -54485,7 +46310,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1933), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -54500,22 +46325,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34459, 34686), }); declarations.push(Declaration { - id: DeclarationId(1392), + id: DeclarationId(1393), name: Some("rust_length_callable".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(904), + template: DeclarationId(905), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), + meta_tag: Some(DeclarationId(905)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54524,7 +46349,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1946), + constructor: DeclarationId(1947), payload: vec![], }, ), @@ -54535,7 +46360,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -54549,13 +46374,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34688, 34875), }); declarations.push(Declaration { - id: DeclarationId(1393), -======= - span: SourceSpan::new("src/v3/spec/rust.dag", 34688, 34875), - }); - declarations.push(Declaration { - id: DeclarationId(1392), ->>>>>>> origin/main + id: DeclarationId(1394), name: Some("rust_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -54570,11 +46389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54592,11 +46407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 34877, 35020), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1394), -======= - id: DeclarationId(1393), ->>>>>>> origin/main + id: DeclarationId(1395), name: Some("rust_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -54611,11 +46422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54635,11 +46442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35299, 35470), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1395), -======= - id: DeclarationId(1394), ->>>>>>> origin/main + id: DeclarationId(1396), name: Some("rust_lookup_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -54654,11 +46457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54676,11 +46475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35472, 35622), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1396), -======= - id: DeclarationId(1395), ->>>>>>> origin/main + id: DeclarationId(1397), name: Some("rust_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -54695,11 +46490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54719,11 +46510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35624, 35774), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1397), -======= - id: DeclarationId(1396), ->>>>>>> origin/main + id: DeclarationId(1398), name: Some("rust_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -54738,11 +46525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54751,11 +46534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1947), -======= - constructor: DeclarationId(1946), ->>>>>>> origin/main + constructor: DeclarationId(1948), payload: vec![], }, ), @@ -54766,11 +46545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -54784,11 +46559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35776, 35968), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1398), -======= - id: DeclarationId(1397), ->>>>>>> origin/main + id: DeclarationId(1399), name: Some("rust_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -54803,11 +46574,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54816,9 +46583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD -======= - constructor: DeclarationId(1947), + constructor: DeclarationId(1949), payload: vec![], }, ), @@ -54830,7 +46595,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1931), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -54840,7 +46605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1934), payload: vec![], }, ), @@ -54850,7 +46615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1931), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -54865,7 +46630,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 35970, 36231), }); declarations.push(Declaration { - id: DeclarationId(1398), + id: DeclarationId(1400), name: Some("rust_map_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -54880,7 +46645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -54889,8 +46654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { ->>>>>>> origin/main - constructor: DeclarationId(1948), + constructor: DeclarationId(1950), payload: vec![], }, ), @@ -54902,11 +46666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -54916,25 +46676,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD constructor: DeclarationId(1933), payload: vec![], }, ), ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(2))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), ]), ), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), @@ -54942,19 +46688,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/rust.dag", 35970, 36231), - }); - declarations.push(Declaration { - id: DeclarationId(1399), - name: Some("rust_map_callable".to_string()), -======= span: SourceSpan::new("src/v3/spec/rust.dag", 36233, 36451), }); declarations.push(Declaration { - id: DeclarationId(1399), + id: DeclarationId(1401), name: Some("rust_filter_callable".to_string()), ->>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -54968,24 +46706,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(620)), -======= - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), FieldValue::Reference(DeclarationId(623)), ->>>>>>> origin/main ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1949), + constructor: DeclarationId(1951), payload: vec![], }, ), @@ -54997,11 +46727,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -55011,11 +46737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -55027,113 +46749,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/spec/rust.dag", 36233, 36451), - }); - declarations.push(Declaration { - id: DeclarationId(1400), - name: Some("rust_filter_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), -======= span: SourceSpan::new("src/v3/spec/rust.dag", 36453, 36680), }); declarations.push(Declaration { - id: DeclarationId(1400), + id: DeclarationId(1402), name: Some("rust_contains_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), ->>>>>>> origin/main arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(904)), -======= meta_tag: Some(DeclarationId(905)), ->>>>>>> origin/main - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(623)), -======= - FieldValue::Reference(DeclarationId(1415)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(638)), ->>>>>>> origin/main - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1950), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1932), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 36453, 36680), - }); - declarations.push(Declaration { - id: DeclarationId(1401), - name: Some("rust_contains_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -55142,7 +46776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1951), + constructor: DeclarationId(1952), payload: vec![], }, ), @@ -55154,7 +46788,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -55164,10 +46798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "disposition".to_string(), FieldValue::Variant { - constructor: DeclarationId(1932), -======= - constructor: DeclarationId(1931), ->>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -55182,11 +46813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 36682, 36915), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1402), -======= - id: DeclarationId(1401), ->>>>>>> origin/main + id: DeclarationId(1403), name: Some("rust_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(914), @@ -55201,11 +46828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -55214,29 +46837,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "strategy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1953), -======= - constructor: DeclarationId(1952), ->>>>>>> origin/main + constructor: DeclarationId(1954), payload: vec![], }, ), ( "empty_variant".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1504)), - ), - ( - "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1506)), -======= - FieldValue::Reference(DeclarationId(1503)), + FieldValue::Reference(DeclarationId(1505)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1505)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1507)), ), ( "scrutinee".to_string(), @@ -55268,11 +46879,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37143, 37447), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1403), -======= - id: DeclarationId(1402), ->>>>>>> origin/main + id: DeclarationId(1404), name: Some("rust_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -55304,11 +46911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37449, 37587), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1404), -======= - id: DeclarationId(1403), ->>>>>>> origin/main + id: DeclarationId(1405), name: Some("rust_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -55342,11 +46945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37589, 37742), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1405), -======= - id: DeclarationId(1404), ->>>>>>> origin/main + id: DeclarationId(1406), name: Some("rust_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -55391,11 +46990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37744, 37934), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1406), -======= - id: DeclarationId(1405), ->>>>>>> origin/main + id: DeclarationId(1407), name: Some("rust_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -55427,11 +47022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 37936, 38048), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1407), -======= - id: DeclarationId(1406), ->>>>>>> origin/main + id: DeclarationId(1408), name: Some("rust_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -55453,11 +47044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38050, 38110), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1408), -======= - id: DeclarationId(1407), ->>>>>>> origin/main + id: DeclarationId(1409), name: Some("rust_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -55503,11 +47090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38112, 38390), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1409), -======= - id: DeclarationId(1408), ->>>>>>> origin/main + id: DeclarationId(1410), name: Some("rust_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -55529,11 +47112,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38392, 38480), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1410), -======= - id: DeclarationId(1409), ->>>>>>> origin/main + id: DeclarationId(1411), name: Some("rust_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -55579,11 +47158,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38482, 38784), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1411), -======= - id: DeclarationId(1410), ->>>>>>> origin/main + id: DeclarationId(1412), name: Some("rust_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -55615,11 +47190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 38786, 38999), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1412), -======= - id: DeclarationId(1411), ->>>>>>> origin/main + id: DeclarationId(1413), name: Some("rust_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(926), @@ -55676,15 +47247,9 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39001, 39336), }); -<<<<<<< HEAD - declarations.push(Declaration { id: DeclarationId(1413), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(926), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(926)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); + declarations.push(Declaration { id: DeclarationId(1414), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(927)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); declarations.push(Declaration { - id: DeclarationId(1414), -======= - declarations.push(Declaration { id: DeclarationId(1412), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(927)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); - declarations.push(Declaration { - id: DeclarationId(1413), ->>>>>>> origin/main + id: DeclarationId(1415), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -55728,11 +47293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 39931, 40203), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1415), -======= - id: DeclarationId(1414), ->>>>>>> origin/main + id: DeclarationId(1416), name: Some("rust_rendering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(929), @@ -55748,22 +47309,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "read".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1954), -======= - constructor: DeclarationId(1953), ->>>>>>> origin/main + constructor: DeclarationId(1955), payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1956), -======= - constructor: DeclarationId(1955), ->>>>>>> origin/main + constructor: DeclarationId(1957), payload: vec![], }, ), @@ -55774,11 +47327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40205, 40286), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1416), -======= - id: DeclarationId(1415), ->>>>>>> origin/main + id: DeclarationId(1417), name: Some("rust_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(932), @@ -55793,99 +47342,51 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "statements".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1403)), - ), - ( - "expressions".to_string(), FieldValue::Reference(DeclarationId(1404)), ), - ( - "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1405)), - ), - ( - "literals".to_string(), - FieldValue::Reference(DeclarationId(1406)), - ), - ( - "modules".to_string(), - FieldValue::Reference(DeclarationId(1407)), - ), - ( - "functions".to_string(), - FieldValue::Reference(DeclarationId(1408)), - ), - ( - "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1409)), - ), - ( - "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1410)), - ), - ( - "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1411)), - ), - ( - "patterns".to_string(), - FieldValue::Reference(DeclarationId(1412)), - ), - ( - "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1413)), - ), - ( - "values".to_string(), - FieldValue::Reference(DeclarationId(1414)), -======= - FieldValue::Reference(DeclarationId(1402)), - ), ( "expressions".to_string(), - FieldValue::Reference(DeclarationId(1403)), + FieldValue::Reference(DeclarationId(1405)), ), ( "control_flow".to_string(), - FieldValue::Reference(DeclarationId(1404)), + FieldValue::Reference(DeclarationId(1406)), ), ( "literals".to_string(), - FieldValue::Reference(DeclarationId(1405)), + FieldValue::Reference(DeclarationId(1407)), ), ( "modules".to_string(), - FieldValue::Reference(DeclarationId(1406)), + FieldValue::Reference(DeclarationId(1408)), ), ( "functions".to_string(), - FieldValue::Reference(DeclarationId(1407)), + FieldValue::Reference(DeclarationId(1409)), ), ( "type_applications".to_string(), - FieldValue::Reference(DeclarationId(1408)), + FieldValue::Reference(DeclarationId(1410)), ), ( "type_definitions".to_string(), - FieldValue::Reference(DeclarationId(1409)), + FieldValue::Reference(DeclarationId(1411)), ), ( "record_derive_templates".to_string(), - FieldValue::Reference(DeclarationId(1410)), + FieldValue::Reference(DeclarationId(1412)), ), ( "patterns".to_string(), - FieldValue::Reference(DeclarationId(1411)), + FieldValue::Reference(DeclarationId(1413)), ), ( "collection_ops".to_string(), - FieldValue::Reference(DeclarationId(1412)), + FieldValue::Reference(DeclarationId(1414)), ), ( "values".to_string(), - FieldValue::Reference(DeclarationId(1413)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1415)), ), ], }), @@ -55894,11 +47395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 40288, 40733), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1417), -======= - id: DeclarationId(1416), ->>>>>>> origin/main + id: DeclarationId(1418), name: Some("rust_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(831), @@ -55934,11 +47431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42157, 42296), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1418), -======= - id: DeclarationId(1417), ->>>>>>> origin/main + id: DeclarationId(1419), name: Some("rust_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(822), @@ -55954,87 +47447,55 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "expression_wrapping".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1805), -======= - constructor: DeclarationId(1804), ->>>>>>> origin/main + constructor: DeclarationId(1806), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1808), -======= - constructor: DeclarationId(1807), ->>>>>>> origin/main + constructor: DeclarationId(1809), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1812), -======= - constructor: DeclarationId(1811), ->>>>>>> origin/main + constructor: DeclarationId(1813), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1814), -======= - constructor: DeclarationId(1813), ->>>>>>> origin/main + constructor: DeclarationId(1815), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1817), -======= - constructor: DeclarationId(1816), ->>>>>>> origin/main + constructor: DeclarationId(1818), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1820), -======= - constructor: DeclarationId(1819), ->>>>>>> origin/main + constructor: DeclarationId(1821), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1823), -======= - constructor: DeclarationId(1822), ->>>>>>> origin/main + constructor: DeclarationId(1824), payload: vec![], }, ), ( "correction_style".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1417)), -======= - FieldValue::Reference(DeclarationId(1416)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1418)), ), ( "post_emit_verifier".to_string(), @@ -56066,11 +47527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "output_policy".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1826), -======= - constructor: DeclarationId(1825), ->>>>>>> origin/main + constructor: DeclarationId(1827), payload: vec![], }, ), @@ -56083,11 +47540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42298, 42911), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1419), -======= - id: DeclarationId(1418), ->>>>>>> origin/main + id: DeclarationId(1420), name: Some("rust_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(823), @@ -56102,19 +47555,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), - ), - ( - "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1418)), -======= - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ( "clean_emission".to_string(), - FieldValue::Reference(DeclarationId(1417)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1419)), ), ], }), @@ -56123,11 +47568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 42913, 43043), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1420), -======= - id: DeclarationId(1419), ->>>>>>> origin/main + id: DeclarationId(1421), name: Some("rust_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -56151,11 +47592,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44145, 44248), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1421), -======= - id: DeclarationId(1420), ->>>>>>> origin/main + id: DeclarationId(1422), name: Some("rust_node_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -56179,11 +47616,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44250, 44353), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1422), -======= - id: DeclarationId(1421), ->>>>>>> origin/main + id: DeclarationId(1423), name: Some("rust_resolve_producer_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -56207,11 +47640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44355, 44482), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1423), -======= - id: DeclarationId(1422), ->>>>>>> origin/main + id: DeclarationId(1424), name: Some("port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -56219,43 +47648,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(746)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "accessor".to_string(), - FieldValue::Reference(DeclarationId(747)), - ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1420)), - ), - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44615), - }); - declarations.push(Declaration { - id: DeclarationId(1424), - name: Some("node_binding_rust".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(746), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(746)), -======= meta_tag: Some(DeclarationId(747)), ->>>>>>> origin/main specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -56270,11 +47663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ], }), @@ -56283,13 +47672,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44484, 44615), }); declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(1425), - name: Some("resolve_producer_binding_rust".to_string()), -======= - id: DeclarationId(1423), name: Some("node_binding_rust".to_string()), ->>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(747), arguments: vec![], @@ -56311,10 +47695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), + FieldValue::Reference(DeclarationId(1417)), ), ], }), @@ -56323,7 +47704,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44617, 44748), }); declarations.push(Declaration { - id: DeclarationId(1424), + id: DeclarationId(1426), name: Some("resolve_producer_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -56342,12 +47723,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1421)), + FieldValue::Reference(DeclarationId(1423)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ], }), @@ -56356,11 +47736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 44750, 44917), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1426), -======= - id: DeclarationId(1425), ->>>>>>> origin/main + id: DeclarationId(1427), name: Some("rust_lane2_workflow_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -56384,11 +47760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45428, 45557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1427), -======= - id: DeclarationId(1426), ->>>>>>> origin/main + id: DeclarationId(1428), name: Some("lane2_workflow_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -56407,19 +47779,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1426)), - ), - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1425)), + FieldValue::Reference(DeclarationId(1427)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ], }), @@ -56428,11 +47792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 45559, 45726), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1428), -======= - id: DeclarationId(1427), ->>>>>>> origin/main + id: DeclarationId(1429), name: Some("rust_workflow_root_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -56456,11 +47816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46421, 46535), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1429), -======= - id: DeclarationId(1428), ->>>>>>> origin/main + id: DeclarationId(1430), name: Some("workflow_root_port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -56479,19 +47835,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1428)), - ), - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1427)), + FieldValue::Reference(DeclarationId(1429)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ], }), @@ -56500,11 +47848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 46537, 46710), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1430), -======= - id: DeclarationId(1429), ->>>>>>> origin/main + id: DeclarationId(1431), name: Some("rust_workflow_root".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -56519,11 +47863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ( "target".to_string(), @@ -56546,11 +47886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47122, 47283), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1431), -======= - id: DeclarationId(1430), ->>>>>>> origin/main + id: DeclarationId(1432), name: Some("rust_declaration_by_id_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -56574,11 +47910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47610, 47733), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1432), -======= - id: DeclarationId(1431), ->>>>>>> origin/main + id: DeclarationId(1433), name: Some("declaration_by_id_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -56597,19 +47929,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), ( "realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1431)), - ), - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1416)), -======= - FieldValue::Reference(DeclarationId(1430)), + FieldValue::Reference(DeclarationId(1432)), ), ( "language".to_string(), - FieldValue::Reference(DeclarationId(1415)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1417)), ), ], }), @@ -56618,11 +47942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/spec/rust.dag", 47735, 47905), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1433), -======= - id: DeclarationId(1432), ->>>>>>> origin/main + id: DeclarationId(1434), name: Some("CompilerHostRealization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -56641,37 +47961,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 453, 502), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1434), -======= - id: DeclarationId(1433), ->>>>>>> origin/main + id: DeclarationId(1435), name: Some("PipelineSnapshotKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SnapshotSurface".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2254), - }, - Field { - label: "SnapshotDag".to_string(), ty: DeclarationId(2255), }, - Field { - label: "SnapshotText".to_string(), - ty: DeclarationId(2256), -======= - ty: DeclarationId(2253), - }, Field { label: "SnapshotDag".to_string(), - ty: DeclarationId(2254), ->>>>>>> origin/main + ty: DeclarationId(2256), }, Field { label: "SnapshotText".to_string(), - ty: DeclarationId(2255), + ty: DeclarationId(2257), }, ], }, @@ -56686,37 +47990,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 504, 576), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1435), -======= - id: DeclarationId(1434), ->>>>>>> origin/main + id: DeclarationId(1436), name: Some("PipelineStageBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "stage".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "realization".to_string(), - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "snapshot".to_string(), - ty: DeclarationId(1434), -======= - ty: DeclarationId(1085), - }, - Field { - label: "realization".to_string(), - ty: DeclarationId(1085), - }, - Field { - label: "snapshot".to_string(), - ty: DeclarationId(1433), ->>>>>>> origin/main + ty: DeclarationId(1435), }, ], }, @@ -56731,11 +48019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 578, 694), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1436), -======= - id: DeclarationId(1435), ->>>>>>> origin/main + id: DeclarationId(1437), name: Some("parse_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -56745,11 +48029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1433)), -======= - meta_tag: Some(DeclarationId(1432)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1434)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -56763,11 +48043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 696, 780), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1437), -======= - id: DeclarationId(1436), ->>>>>>> origin/main + id: DeclarationId(1438), name: Some("lower_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -56777,11 +48053,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1433)), -======= - meta_tag: Some(DeclarationId(1432)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1434)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -56795,11 +48067,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 782, 866), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1438), -======= - id: DeclarationId(1437), ->>>>>>> origin/main + id: DeclarationId(1439), name: Some("infer_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -56809,11 +48077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1433)), -======= - meta_tag: Some(DeclarationId(1432)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1434)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -56827,11 +48091,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 868, 952), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1439), -======= - id: DeclarationId(1438), ->>>>>>> origin/main + id: DeclarationId(1440), name: Some("compute_ownership_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -56841,11 +48101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1433)), -======= - meta_tag: Some(DeclarationId(1432)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1434)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -56861,11 +48117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 954, 1062), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1440), -======= - id: DeclarationId(1439), ->>>>>>> origin/main + id: DeclarationId(1441), name: Some("emit_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -56875,11 +48127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1433)), -======= - meta_tag: Some(DeclarationId(1432)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1434)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -56893,11 +48141,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1064, 1146), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1441), -======= - id: DeclarationId(1440), ->>>>>>> origin/main + id: DeclarationId(1442), name: Some("lens_complexity_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -56907,11 +48151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1433)), -======= - meta_tag: Some(DeclarationId(1432)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1434)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -56927,110 +48167,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1148, 1252), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1442), - name: Some("parse_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1435), -======= - id: DeclarationId(1441), - name: Some("parse_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1434), ->>>>>>> origin/main - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1435)), -======= - meta_tag: Some(DeclarationId(1434)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1447)), - ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1435)), - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2253), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), - }); - declarations.push(Declaration { - id: DeclarationId(1442), - name: Some("lower_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1434), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1434)), ->>>>>>> origin/main - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1448)), - ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1436)), - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2254), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), - }); - declarations.push(Declaration { - id: DeclarationId(1443), - name: Some("lower_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1435), -======= - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), - }); - declarations.push(Declaration { id: DeclarationId(1443), - name: Some("infer_stage_binding".to_string()), + name: Some("parse_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1434), ->>>>>>> origin/main + template: DeclarationId(1436), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1435)), -======= - meta_tag: Some(DeclarationId(1434)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1436)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57046,11 +48191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "snapshot".to_string(), FieldValue::Variant { -<<<<<<< HEAD constructor: DeclarationId(2255), -======= - constructor: DeclarationId(2254), ->>>>>>> origin/main payload: vec![], }, ), @@ -57058,32 +48199,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), - }); - declarations.push(Declaration { - id: DeclarationId(1444), - name: Some("infer_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1435), -======= - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), }); declarations.push(Declaration { id: DeclarationId(1444), - name: Some("compute_ownership_stage_binding".to_string()), + name: Some("lower_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1434), ->>>>>>> origin/main + template: DeclarationId(1436), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1435)), -======= - meta_tag: Some(DeclarationId(1434)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1436)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57095,12 +48222,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "realization".to_string(), FieldValue::Reference(DeclarationId(1438)), -<<<<<<< HEAD ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2255), + constructor: DeclarationId(2256), payload: vec![], }, ), @@ -57108,18 +48234,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), }); declarations.push(Declaration { id: DeclarationId(1445), - name: Some("compute_ownership_stage_binding".to_string()), + name: Some("infer_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1435), + template: DeclarationId(1436), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1435)), + meta_tag: Some(DeclarationId(1436)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57131,13 +48257,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ( "realization".to_string(), FieldValue::Reference(DeclarationId(1439)), -======= ->>>>>>> origin/main ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2255), + constructor: DeclarationId(2256), payload: vec![], }, ), @@ -57145,18 +48269,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), + span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1510, 1634), }); declarations.push(Declaration { id: DeclarationId(1446), - name: Some("lens_complexity_stage_binding".to_string()), + name: Some("compute_ownership_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1435), + template: DeclarationId(1436), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1435)), + meta_tag: Some(DeclarationId(1436)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57165,41 +48289,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { "stage".to_string(), FieldValue::Reference(DeclarationId(1452)), ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1441)), - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2255), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), - }); - declarations.push(Declaration { - id: DeclarationId(1447), - name: Some("emit_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1435), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1435)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1453)), - ), ( "realization".to_string(), FieldValue::Reference(DeclarationId(1440)), @@ -57218,31 +48307,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1636, 1796), }); declarations.push(Declaration { - id: DeclarationId(1445), + id: DeclarationId(1447), name: Some("lens_complexity_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1434), + template: DeclarationId(1436), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1434)), + meta_tag: Some(DeclarationId(1436)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1451)), + FieldValue::Reference(DeclarationId(1453)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1440)), + FieldValue::Reference(DeclarationId(1442)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2254), + constructor: DeclarationId(2256), payload: vec![], }, ), @@ -57253,39 +48342,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1798, 1952), }); declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(1448), - name: Some("parse".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(197), DeclarationId(197)], - output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1436)), -======= - id: DeclarationId(1446), name: Some("emit_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1434), + template: DeclarationId(1436), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1434)), + meta_tag: Some(DeclarationId(1436)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "stage".to_string(), - FieldValue::Reference(DeclarationId(1452)), + FieldValue::Reference(DeclarationId(1454)), ), ( "realization".to_string(), - FieldValue::Reference(DeclarationId(1439)), + FieldValue::Reference(DeclarationId(1441)), ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2255), + constructor: DeclarationId(2257), payload: vec![], }, ), @@ -57296,13 +48377,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1954, 2076), }); declarations.push(Declaration { - id: DeclarationId(1447), + id: DeclarationId(1449), name: Some("parse".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197), DeclarationId(197)], output: DeclarationId(745), - body: ArrowBody::ExternalRealization(DeclarationId(1435)), ->>>>>>> origin/main + body: ArrowBody::ExternalRealization(DeclarationId(1437)), }, type_params: vec![], phantom_params: Vec::new(), @@ -57315,16 +48395,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2078, 2140), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1449), - name: Some("lower".to_string()), -======= - id: DeclarationId(1448), + id: DeclarationId(1450), name: Some("lower".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745)], output: DeclarationId(745), - body: ArrowBody::ExternalRealization(DeclarationId(1436)), + body: ArrowBody::ExternalRealization(DeclarationId(1438)), }, type_params: vec![], phantom_params: Vec::new(), @@ -57337,50 +48413,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), }); declarations.push(Declaration { - id: DeclarationId(1449), + id: DeclarationId(1451), name: Some("infer".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745)], output: DeclarationId(745), - body: ArrowBody::ExternalRealization(DeclarationId(1437)), - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), - }); - declarations.push(Declaration { - id: DeclarationId(1450), - name: Some("compute_ownership".to_string()), ->>>>>>> origin/main - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(745)], - output: DeclarationId(745), - body: ArrowBody::ExternalRealization(DeclarationId(1438)), - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1450), - name: Some("infer".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744)], - output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1438)), + body: ArrowBody::ExternalRealization(DeclarationId(1439)), }, type_params: vec![], phantom_params: Vec::new(), @@ -57393,12 +48431,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2186, 2228), }); declarations.push(Declaration { - id: DeclarationId(1451), + id: DeclarationId(1452), name: Some("compute_ownership".to_string()), -======= - id: DeclarationId(1451), - name: Some("lens_complexity".to_string()), ->>>>>>> origin/main connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745)], output: DeclarationId(745), @@ -57415,12 +48449,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2230, 2288), }); declarations.push(Declaration { - id: DeclarationId(1452), + id: DeclarationId(1453), name: Some("lens_complexity".to_string()), connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744)], - output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1441)), + inputs: vec![DeclarationId(745)], + output: DeclarationId(745), + body: ArrowBody::ExternalRealization(DeclarationId(1442)), }, type_params: vec![], phantom_params: Vec::new(), @@ -57433,11 +48467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2290, 2347), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1453), -======= - id: DeclarationId(1452), ->>>>>>> origin/main + id: DeclarationId(1454), name: Some("emit".to_string()), connective: TypeConnective::Arrow { inputs: vec![ @@ -57447,11 +48477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { DeclarationId(932), ], output: DeclarationId(197), -<<<<<<< HEAD - body: ArrowBody::ExternalRealization(DeclarationId(1440)), -======= - body: ArrowBody::ExternalRealization(DeclarationId(1439)), ->>>>>>> origin/main + body: ArrowBody::ExternalRealization(DeclarationId(1441)), }, type_params: vec![], phantom_params: Vec::new(), @@ -57464,11 +48490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2349, 2460), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1454), -======= - id: DeclarationId(1453), ->>>>>>> origin/main + id: DeclarationId(1455), name: Some("compile".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(932)], @@ -57490,19 +48512,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2462, 2605), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1455), - name: Some("from_symbol".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(197)], - output: DeclarationId(2257), -======= - id: DeclarationId(1454), + id: DeclarationId(1456), name: Some("from_symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197)], - output: DeclarationId(2256), ->>>>>>> origin/main + output: DeclarationId(2258), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -57520,11 +48534,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 108, 771), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1456), -======= - id: DeclarationId(1455), ->>>>>>> origin/main + id: DeclarationId(1457), name: Some("symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(723)], @@ -57542,11 +48552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 773, 1214), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1457), -======= - id: DeclarationId(1456), ->>>>>>> origin/main + id: DeclarationId(1458), name: Some("algebra_field_name".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(723)], @@ -57564,11 +48570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 1216, 2017), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1458), -======= - id: DeclarationId(1457), ->>>>>>> origin/main + id: DeclarationId(1459), name: Some("LensRegistryEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -57597,26 +48599,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 1950, 2045), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1459), - name: Some("lens_cost_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1458), + id: DeclarationId(1460), name: Some("lens_cost_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57644,26 +48635,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2047, 2214), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1460), - name: Some("lens_cost_symbolic_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1459), + id: DeclarationId(1461), name: Some("lens_cost_symbolic_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57691,26 +48671,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2216, 2404), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1461), - name: Some("lens_effect_enumeration_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1460), + id: DeclarationId(1462), name: Some("lens_effect_enumeration_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57738,26 +48707,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2406, 2623), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1462), - name: Some("lens_provenance_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1461), + id: DeclarationId(1463), name: Some("lens_provenance_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57785,26 +48743,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2625, 2810), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1463), - name: Some("lens_structural_resolution_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1462), + id: DeclarationId(1464), name: Some("lens_structural_resolution_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57835,26 +48782,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 2812, 3041), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1464), - name: Some("lens_unused_parameters_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1463), + id: DeclarationId(1465), name: Some("lens_unused_parameters_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57882,26 +48818,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3043, 3256), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1465), - name: Some("lens_infer_helpers_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1464), + id: DeclarationId(1466), name: Some("lens_infer_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57929,26 +48854,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 3883, 4075), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1466), - name: Some("lens_variant_payload_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1465), + id: DeclarationId(1467), name: Some("lens_variant_payload_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -57976,26 +48890,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4077, 4277), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1467), - name: Some("lens_lower_helpers_entry".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1458), -======= - id: DeclarationId(1466), + id: DeclarationId(1468), name: Some("lens_lower_helpers_entry".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1457), ->>>>>>> origin/main + template: DeclarationId(1459), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1458)), -======= - meta_tag: Some(DeclarationId(1457)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1459)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -58023,29 +48926,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/regen.dag", 4527, 4719), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1468), -======= - id: DeclarationId(1467), ->>>>>>> origin/main + id: DeclarationId(1469), name: Some("IntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OrderedRingAlgebra".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2258), - }, - Field { - label: "SemiringAlgebra".to_string(), ty: DeclarationId(2259), -======= - ty: DeclarationId(2257), }, Field { label: "SemiringAlgebra".to_string(), - ty: DeclarationId(2258), ->>>>>>> origin/main + ty: DeclarationId(2260), }, ], }, @@ -58060,29 +48951,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5528, 5590), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1469), -======= - id: DeclarationId(1468), ->>>>>>> origin/main + id: DeclarationId(1470), name: Some("NonIntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BooleanAlgebraAlgebra".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2260), - }, - Field { - label: "TerminalAlgebra".to_string(), ty: DeclarationId(2261), -======= - ty: DeclarationId(2259), }, Field { label: "TerminalAlgebra".to_string(), - ty: DeclarationId(2260), ->>>>>>> origin/main + ty: DeclarationId(2262), }, ], }, @@ -58097,69 +48976,37 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5592, 5660), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1470), -======= - id: DeclarationId(1469), ->>>>>>> origin/main + id: DeclarationId(1471), name: Some("TargetCarrier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BitCarrier".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2262), - }, - Field { - label: "ByteCarrier".to_string(), ty: DeclarationId(2263), }, - Field { - label: "Word16Carrier".to_string(), - ty: DeclarationId(2264), - }, - Field { - label: "Word32Carrier".to_string(), - ty: DeclarationId(2265), - }, - Field { - label: "Word64Carrier".to_string(), - ty: DeclarationId(2266), - }, - Field { - label: "Word128Carrier".to_string(), - ty: DeclarationId(2267), - }, - Field { - label: "TerminalCarrier".to_string(), - ty: DeclarationId(2268), -======= - ty: DeclarationId(2261), - }, Field { label: "ByteCarrier".to_string(), - ty: DeclarationId(2262), + ty: DeclarationId(2264), }, Field { label: "Word16Carrier".to_string(), - ty: DeclarationId(2263), + ty: DeclarationId(2265), }, Field { label: "Word32Carrier".to_string(), - ty: DeclarationId(2264), + ty: DeclarationId(2266), }, Field { label: "Word64Carrier".to_string(), - ty: DeclarationId(2265), + ty: DeclarationId(2267), }, Field { label: "Word128Carrier".to_string(), - ty: DeclarationId(2266), + ty: DeclarationId(2268), }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2267), ->>>>>>> origin/main + ty: DeclarationId(2269), }, ], }, @@ -58174,37 +49021,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7234, 7376), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1471), -======= - id: DeclarationId(1470), ->>>>>>> origin/main + id: DeclarationId(1472), name: Some("IntegerOverflow".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TwoComplementWrap".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2269), - }, - Field { - label: "Saturating".to_string(), ty: DeclarationId(2270), }, - Field { - label: "Trap".to_string(), - ty: DeclarationId(2271), -======= - ty: DeclarationId(2268), - }, Field { label: "Saturating".to_string(), - ty: DeclarationId(2269), ->>>>>>> origin/main + ty: DeclarationId(2271), }, Field { label: "Trap".to_string(), - ty: DeclarationId(2270), + ty: DeclarationId(2272), }, ], }, @@ -58219,29 +49050,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8093, 8159), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1472), -======= - id: DeclarationId(1471), ->>>>>>> origin/main + id: DeclarationId(1473), name: Some("RustPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerPrimitive".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2272), - }, - Field { - label: "NonIntegerPrimitive".to_string(), ty: DeclarationId(2273), -======= - ty: DeclarationId(2271), }, Field { label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2272), ->>>>>>> origin/main + ty: DeclarationId(2274), }, ], }, @@ -58256,209 +49075,117 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8914, 9696), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1473), -======= - id: DeclarationId(1472), ->>>>>>> origin/main + id: DeclarationId(1474), name: Some("rust_pilot_primitives".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1472), -======= - value: DeclarationId(1471), ->>>>>>> origin/main + value: DeclarationId(1473), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2274)), -======= - meta_tag: Some(DeclarationId(2273)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(2275)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2272), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2258), -======= - constructor: DeclarationId(2271), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2257), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2262), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("-128".to_string())), - FieldValue::Literal(LiteralBits::String("127".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2268), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2271), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2257), ->>>>>>> origin/main + constructor: DeclarationId(2259), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2263), + constructor: DeclarationId(2264), payload: vec![], }, -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2269), -======= - FieldValue::Literal(LiteralBits::String("-32768".to_string())), - FieldValue::Literal(LiteralBits::String("32767".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2268), ->>>>>>> origin/main + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2272), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2258), -======= - constructor: DeclarationId(2271), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i32".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2257), ->>>>>>> origin/main + constructor: DeclarationId(2259), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2264), + constructor: DeclarationId(2265), payload: vec![], }, -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2269), -======= - FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), - FieldValue::Literal(LiteralBits::String("2147483647".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2268), ->>>>>>> origin/main + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2272), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2258), -======= - constructor: DeclarationId(2271), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i64".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2257), ->>>>>>> origin/main + constructor: DeclarationId(2259), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2265), + constructor: DeclarationId(2266), payload: vec![], }, -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), FieldValue::Literal(LiteralBits::String("2147483647".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2269), + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2272), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("i64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2258), + constructor: DeclarationId(2259), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2266), + constructor: DeclarationId(2267), payload: vec![], }, -======= ->>>>>>> origin/main FieldValue::Literal(LiteralBits::String( "-9223372036854775808".to_string(), )), FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2269), -======= - constructor: DeclarationId(2268), ->>>>>>> origin/main + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2272), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i128".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2258), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2267), -======= - constructor: DeclarationId(2271), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2257), + constructor: DeclarationId(2259), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2266), ->>>>>>> origin/main + constructor: DeclarationId(2268), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -58469,216 +49196,122 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2269), -======= - constructor: DeclarationId(2268), ->>>>>>> origin/main + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2272), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2259), -======= - constructor: DeclarationId(2271), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2258), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2262), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("0".to_string())), - FieldValue::Literal(LiteralBits::String("255".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2268), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2271), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2258), ->>>>>>> origin/main + constructor: DeclarationId(2260), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2263), + constructor: DeclarationId(2264), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2269), -======= - FieldValue::Literal(LiteralBits::String("65535".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2268), ->>>>>>> origin/main + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2272), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2259), -======= - constructor: DeclarationId(2271), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u32".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2258), ->>>>>>> origin/main + constructor: DeclarationId(2260), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2264), + constructor: DeclarationId(2265), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2269), -======= - FieldValue::Literal(LiteralBits::String("4294967295".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2268), ->>>>>>> origin/main + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2272), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2259), -======= - constructor: DeclarationId(2271), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u64".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2258), ->>>>>>> origin/main + constructor: DeclarationId(2260), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2265), + constructor: DeclarationId(2266), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2269), + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2272), + constructor: DeclarationId(2273), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2260), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2266), + constructor: DeclarationId(2267), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -======= ->>>>>>> origin/main FieldValue::Literal(LiteralBits::String( "18446744073709551615".to_string(), )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2269), -======= - constructor: DeclarationId(2268), ->>>>>>> origin/main + constructor: DeclarationId(2270), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2273), - payload: vec![ - FieldValue::Literal(LiteralBits::String("bool".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2260), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2262), -======= - constructor: DeclarationId(2272), + constructor: DeclarationId(2274), payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { - constructor: DeclarationId(2259), + constructor: DeclarationId(2261), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2261), ->>>>>>> origin/main + constructor: DeclarationId(2263), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2273), + constructor: DeclarationId(2274), payload: vec![ FieldValue::Literal(LiteralBits::String("()".to_string())), FieldValue::Variant { - constructor: DeclarationId(2261), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2268), -======= - constructor: DeclarationId(2272), - payload: vec![ - FieldValue::Literal(LiteralBits::String("()".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2260), + constructor: DeclarationId(2262), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2267), ->>>>>>> origin/main + constructor: DeclarationId(2269), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -58690,11 +49323,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9996, 13318), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1474), -======= - id: DeclarationId(1473), ->>>>>>> origin/main + id: DeclarationId(1475), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58714,11 +49343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3259, 3272), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1475), -======= - id: DeclarationId(1474), ->>>>>>> origin/main + id: DeclarationId(1476), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58738,11 +49363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3421, 3434), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1476), -======= - id: DeclarationId(1475), ->>>>>>> origin/main + id: DeclarationId(1477), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58762,11 +49383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3439, 3452), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1477), -======= - id: DeclarationId(1476), ->>>>>>> origin/main + id: DeclarationId(1478), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58786,11 +49403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 3556, 3569), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1478), -======= - id: DeclarationId(1477), ->>>>>>> origin/main + id: DeclarationId(1479), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58810,11 +49423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4162, 4169), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1479), -======= - id: DeclarationId(1478), ->>>>>>> origin/main + id: DeclarationId(1480), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(614), DeclarationId(613)], @@ -58832,11 +49441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1480), -======= - id: DeclarationId(1479), ->>>>>>> origin/main + id: DeclarationId(1481), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58856,11 +49461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4617, 4624), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1481), -======= - id: DeclarationId(1480), ->>>>>>> origin/main + id: DeclarationId(1482), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(616), DeclarationId(617)], @@ -58878,30 +49479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4638, 4651), }); declarations.push(Declaration { -<<<<<<< HEAD -======= - id: DeclarationId(1481), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(619), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349), - }); - declarations.push(Declaration { ->>>>>>> origin/main - id: DeclarationId(1482), + id: DeclarationId(1483), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58918,14 +49496,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD span: SourceSpan::new("src/v3/std/list.dag", 5336, 5349), -======= - span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367), ->>>>>>> origin/main }); declarations.push(Declaration { - id: DeclarationId(1483), + id: DeclarationId(1484), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58942,11 +49516,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD span: SourceSpan::new("src/v3/std/list.dag", 5354, 5367), }); declarations.push(Declaration { - id: DeclarationId(1484), + id: DeclarationId(1485), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58966,13 +49539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), }); declarations.push(Declaration { - id: DeclarationId(1485), -======= - span: SourceSpan::new("src/v3/std/list.dag", 5372, 5385), - }); - declarations.push(Declaration { - id: DeclarationId(1484), ->>>>>>> origin/main + id: DeclarationId(1486), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58992,11 +49559,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5686, 5693), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1486), -======= - id: DeclarationId(1485), ->>>>>>> origin/main + id: DeclarationId(1487), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(621)], @@ -59014,11 +49577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5698, 5708), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1487), -======= - id: DeclarationId(1486), ->>>>>>> origin/main + id: DeclarationId(1488), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59038,11 +49597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5713, 5720), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1488), -======= - id: DeclarationId(1487), ->>>>>>> origin/main + id: DeclarationId(1489), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59062,11 +49617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5867, 5874), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1489), -======= - id: DeclarationId(1488), ->>>>>>> origin/main + id: DeclarationId(1490), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(624)], @@ -59084,11 +49635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1490), -======= - id: DeclarationId(1489), ->>>>>>> origin/main + id: DeclarationId(1491), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59108,11 +49655,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5897, 5904), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1491), -======= - id: DeclarationId(1490), ->>>>>>> origin/main + id: DeclarationId(1492), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59132,11 +49675,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6130, 6137), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1492), -======= - id: DeclarationId(1491), ->>>>>>> origin/main + id: DeclarationId(1493), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59156,19 +49695,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6151, 6158), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1493), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(626)], - output: DeclarationId(1492), -======= - id: DeclarationId(1492), + id: DeclarationId(1494), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(626)], - output: DeclarationId(1491), ->>>>>>> origin/main + output: DeclarationId(1493), body: ArrowBody::NoBody, }, type_params: vec![], @@ -59182,11 +49713,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6142, 6158), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1494), -======= - id: DeclarationId(1493), ->>>>>>> origin/main + id: DeclarationId(1495), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59206,11 +49733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6163, 6170), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1495), -======= - id: DeclarationId(1494), ->>>>>>> origin/main + id: DeclarationId(1496), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59230,11 +49753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6356, 6363), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1496), -======= - id: DeclarationId(1495), ->>>>>>> origin/main + id: DeclarationId(1497), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59254,11 +49773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 6588, 6595), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1497), -======= - id: DeclarationId(1496), ->>>>>>> origin/main + id: DeclarationId(1498), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59278,11 +49793,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7202, 7209), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1498), -======= - id: DeclarationId(1497), ->>>>>>> origin/main + id: DeclarationId(1499), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -59302,21 +49813,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7219, 7236), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1499), -======= - id: DeclarationId(1498), ->>>>>>> origin/main + id: DeclarationId(1500), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1498), -======= - value: DeclarationId(1497), ->>>>>>> origin/main + value: DeclarationId(1499), }], }, type_params: vec![], @@ -59330,11 +49833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7214, 7237), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1500), -======= - id: DeclarationId(1499), ->>>>>>> origin/main + id: DeclarationId(1501), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59354,11 +49853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7415, 7422), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1501), -======= - id: DeclarationId(1500), ->>>>>>> origin/main + id: DeclarationId(1502), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -59378,21 +49873,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7444, 7461), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1502), -======= - id: DeclarationId(1501), ->>>>>>> origin/main + id: DeclarationId(1503), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1501), -======= - value: DeclarationId(1500), ->>>>>>> origin/main + value: DeclarationId(1502), }], }, type_params: vec![], @@ -59406,11 +49893,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 7439, 7462), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1503), -======= - id: DeclarationId(1502), ->>>>>>> origin/main + id: DeclarationId(1504), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59430,11 +49913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 8177, 8184), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1504), -======= - id: DeclarationId(1503), ->>>>>>> origin/main + id: DeclarationId(1505), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -59448,11 +49927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2106, 2111), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1505), -======= - id: DeclarationId(1504), ->>>>>>> origin/main + id: DeclarationId(1506), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59472,11 +49947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2144, 2157), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1506), -======= - id: DeclarationId(1505), ->>>>>>> origin/main + id: DeclarationId(1507), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59486,11 +49957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "tail".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1505), -======= - ty: DeclarationId(1504), ->>>>>>> origin/main + ty: DeclarationId(1506), }, ], }, @@ -59505,11 +49972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 2116, 2159), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1507), -======= - id: DeclarationId(1506), ->>>>>>> origin/main + id: DeclarationId(1508), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59529,11 +49992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1477, 1490), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1508), -======= - id: DeclarationId(1507), ->>>>>>> origin/main + id: DeclarationId(1509), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59553,11 +50012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate_minimal.dag", 1570, 1583), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1509), -======= - id: DeclarationId(1508), ->>>>>>> origin/main + id: DeclarationId(1510), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -59574,51 +50029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1510), -======= - id: DeclarationId(1509), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(730), - arguments: vec![TemplateArgument { - parameter: DeclarationId(731), - value: DeclarationId(663), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 20916, 20943), - }); - declarations.push(Declaration { - id: DeclarationId(1510), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(632), - arguments: vec![TemplateArgument { - parameter: DeclarationId(633), - value: DeclarationId(663), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026), - }); - declarations.push(Declaration { id: DeclarationId(1511), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(730), @@ -59658,12 +50069,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20995, 21026), }); declarations.push(Declaration { - id: DeclarationId(1512), + id: DeclarationId(1513), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(729), + template: DeclarationId(730), arguments: vec![TemplateArgument { - parameter: DeclarationId(730), + parameter: DeclarationId(731), value: DeclarationId(663), }], }, @@ -59678,14 +50089,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21058), }); declarations.push(Declaration { - id: DeclarationId(1513), + id: DeclarationId(1514), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( -<<<<<<< HEAD - DeclarationId(1512), -======= - DeclarationId(1511), ->>>>>>> origin/main + DeclarationId(1513), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -59699,11 +50106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1514), -======= - id: DeclarationId(1513), ->>>>>>> origin/main + id: DeclarationId(1515), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59723,11 +50126,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21185, 21206), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1515), -======= - id: DeclarationId(1514), ->>>>>>> origin/main + id: DeclarationId(1516), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(730), @@ -59747,17 +50146,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21238), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1516), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1515), -======= - id: DeclarationId(1515), + id: DeclarationId(1517), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1514), ->>>>>>> origin/main + DeclarationId(1516), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -59771,11 +50163,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1517), -======= - id: DeclarationId(1516), ->>>>>>> origin/main + id: DeclarationId(1518), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59795,11 +50183,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 22268, 22289), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1518), -======= - id: DeclarationId(1517), ->>>>>>> origin/main + id: DeclarationId(1519), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(167), @@ -59816,11 +50200,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1519), -======= - id: DeclarationId(1518), ->>>>>>> origin/main + id: DeclarationId(1520), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -59837,11 +50217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1520), -======= - id: DeclarationId(1519), ->>>>>>> origin/main + id: DeclarationId(1521), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -59858,11 +50234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1521), -======= - id: DeclarationId(1520), ->>>>>>> origin/main + id: DeclarationId(1522), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59882,11 +50254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 37237, 37258), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1522), -======= - id: DeclarationId(1521), ->>>>>>> origin/main + id: DeclarationId(1523), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59906,11 +50274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 37264, 37295), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1523), -======= - id: DeclarationId(1522), ->>>>>>> origin/main + id: DeclarationId(1524), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -59929,11 +50293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7532, 7561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1524), -======= - id: DeclarationId(1523), ->>>>>>> origin/main + id: DeclarationId(1525), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -59952,31 +50312,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 7566, 7595), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1525), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(648), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 7627, 7645), - }); - declarations.push(Declaration { id: DeclarationId(1526), -======= - id: DeclarationId(1524), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60016,16 +50352,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8066, 8084), }); declarations.push(Declaration { - id: DeclarationId(1526), + id: DeclarationId(1528), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "tokens".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1526), -======= - ty: DeclarationId(1525), ->>>>>>> origin/main + ty: DeclarationId(1527), }], }, type_params: vec![], @@ -60039,11 +50371,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8036, 8086), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1528), -======= - id: DeclarationId(1527), ->>>>>>> origin/main + id: DeclarationId(1529), name: None, connective: TypeConnective::Conj { children: vec![ @@ -60068,11 +50396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8091, 8147), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1529), -======= - id: DeclarationId(1528), ->>>>>>> origin/main + id: DeclarationId(1530), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60091,11 +50415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8510, 8555), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1530), -======= - id: DeclarationId(1529), ->>>>>>> origin/main + id: DeclarationId(1531), name: None, connective: TypeConnective::Conj { children: vec![ @@ -60124,11 +50444,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 8560, 8630), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1531), -======= - id: DeclarationId(1530), ->>>>>>> origin/main + id: DeclarationId(1532), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60142,30 +50458,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14355, 14365), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1532), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "key_source".to_string(), - ty: DeclarationId(659), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 14370, 14408), - }); - declarations.push(Declaration { id: DeclarationId(1533), -======= - id: DeclarationId(1531), ->>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60203,7 +50496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14413, 14451), }); declarations.push(Declaration { - id: DeclarationId(1533), + id: DeclarationId(1535), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60222,11 +50515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14697, 14732), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1535), -======= - id: DeclarationId(1534), ->>>>>>> origin/main + id: DeclarationId(1536), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60240,11 +50529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 14737, 14749), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1536), -======= - id: DeclarationId(1535), ->>>>>>> origin/main + id: DeclarationId(1537), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60263,11 +50548,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15171, 15200), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1537), -======= - id: DeclarationId(1536), ->>>>>>> origin/main + id: DeclarationId(1538), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60286,11 +50567,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15205, 15230), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1538), -======= - id: DeclarationId(1537), ->>>>>>> origin/main + id: DeclarationId(1539), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60304,11 +50581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15743, 15753), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1539), -======= - id: DeclarationId(1538), ->>>>>>> origin/main + id: DeclarationId(1540), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60327,11 +50600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 15758, 15796), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1540), -======= - id: DeclarationId(1539), ->>>>>>> origin/main + id: DeclarationId(1541), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60350,11 +50619,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16501, 16528), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1541), -======= - id: DeclarationId(1540), ->>>>>>> origin/main + id: DeclarationId(1542), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60373,11 +50638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16533, 16561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1542), -======= - id: DeclarationId(1541), ->>>>>>> origin/main + id: DeclarationId(1543), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60397,20 +50658,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16589, 16601), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1543), -======= - id: DeclarationId(1542), ->>>>>>> origin/main + id: DeclarationId(1544), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1542), -======= - ty: DeclarationId(1541), ->>>>>>> origin/main + ty: DeclarationId(1543), }], }, type_params: vec![], @@ -60424,11 +50677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 16566, 16603), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1544), -======= - id: DeclarationId(1543), ->>>>>>> origin/main + id: DeclarationId(1545), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60442,11 +50691,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17280, 17293), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1545), -======= - id: DeclarationId(1544), ->>>>>>> origin/main + id: DeclarationId(1546), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60460,11 +50705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17298, 17312), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1546), -======= - id: DeclarationId(1545), ->>>>>>> origin/main + id: DeclarationId(1547), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60483,11 +50724,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 17317, 17349), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1547), -======= - id: DeclarationId(1546), ->>>>>>> origin/main + id: DeclarationId(1548), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60506,11 +50743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19519, 19560), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1548), -======= - id: DeclarationId(1547), ->>>>>>> origin/main + id: DeclarationId(1549), name: None, connective: TypeConnective::Conj { children: vec![ @@ -60535,11 +50768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19565, 19634), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1549), -======= - id: DeclarationId(1548), ->>>>>>> origin/main + id: DeclarationId(1550), name: None, connective: TypeConnective::Conj { children: vec![ @@ -60576,11 +50805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 19639, 19789), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1550), -======= - id: DeclarationId(1549), ->>>>>>> origin/main + id: DeclarationId(1551), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60594,11 +50819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20538, 20559), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1551), -======= - id: DeclarationId(1550), ->>>>>>> origin/main + id: DeclarationId(1552), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(730), @@ -60618,20 +50839,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20590, 20617), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1552), -======= - id: DeclarationId(1551), ->>>>>>> origin/main + id: DeclarationId(1553), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "first_breaker".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1551), -======= - ty: DeclarationId(1550), ->>>>>>> origin/main + ty: DeclarationId(1552), }], }, type_params: vec![], @@ -60645,11 +50858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 20564, 20619), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1553), -======= - id: DeclarationId(1552), ->>>>>>> origin/main + id: DeclarationId(1554), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60669,20 +50878,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24543, 24564), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1554), -======= - id: DeclarationId(1553), ->>>>>>> origin/main + id: DeclarationId(1555), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ops".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1553), -======= - ty: DeclarationId(1552), ->>>>>>> origin/main + ty: DeclarationId(1554), }], }, type_params: vec![], @@ -60696,11 +50897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24523, 24566), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1555), -======= - id: DeclarationId(1554), ->>>>>>> origin/main + id: DeclarationId(1556), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -60720,20 +50917,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24592, 24619), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1556), -======= - id: DeclarationId(1555), ->>>>>>> origin/main + id: DeclarationId(1557), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "arms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1555), -======= - ty: DeclarationId(1554), ->>>>>>> origin/main + ty: DeclarationId(1556), }], }, type_params: vec![], @@ -60747,11 +50936,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24571, 24621), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1557), -======= - id: DeclarationId(1556), ->>>>>>> origin/main + id: DeclarationId(1558), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60770,11 +50955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24626, 24661), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1558), -======= - id: DeclarationId(1557), ->>>>>>> origin/main + id: DeclarationId(1559), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -60794,20 +50975,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24693, 24725), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1559), -======= - id: DeclarationId(1558), ->>>>>>> origin/main + id: DeclarationId(1560), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "branches".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1558), -======= - ty: DeclarationId(1557), ->>>>>>> origin/main + ty: DeclarationId(1559), }], }, type_params: vec![], @@ -60821,11 +50994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 24666, 24727), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1560), -======= - id: DeclarationId(1559), ->>>>>>> origin/main + id: DeclarationId(1561), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60844,11 +51013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25364, 25410), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1561), -======= - id: DeclarationId(1560), ->>>>>>> origin/main + id: DeclarationId(1562), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60867,11 +51032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25415, 25467), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1562), -======= - id: DeclarationId(1561), ->>>>>>> origin/main + id: DeclarationId(1563), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60885,11 +51046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25964, 25984), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1563), -======= - id: DeclarationId(1562), ->>>>>>> origin/main + id: DeclarationId(1564), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60903,11 +51060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 25989, 26010), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1564), -======= - id: DeclarationId(1563), ->>>>>>> origin/main + id: DeclarationId(1565), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60921,11 +51074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26015, 26038), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1565), -======= - id: DeclarationId(1564), ->>>>>>> origin/main + id: DeclarationId(1566), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60939,11 +51088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26043, 26061), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1566), -======= - id: DeclarationId(1565), ->>>>>>> origin/main + id: DeclarationId(1567), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60957,11 +51102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26066, 26084), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1567), -======= - id: DeclarationId(1566), ->>>>>>> origin/main + id: DeclarationId(1568), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60980,11 +51121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26401, 26447), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1568), -======= - id: DeclarationId(1567), ->>>>>>> origin/main + id: DeclarationId(1569), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61003,11 +51140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 26452, 26504), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1569), -======= - id: DeclarationId(1568), ->>>>>>> origin/main + id: DeclarationId(1570), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61021,30 +51154,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33114, 33120), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1570), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "reason".to_string(), - ty: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/effects.dag", 33125, 33162), - }); - declarations.push(Declaration { id: DeclarationId(1571), -======= - id: DeclarationId(1569), ->>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61082,7 +51192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33167, 33204), }); declarations.push(Declaration { - id: DeclarationId(1571), + id: DeclarationId(1573), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61096,11 +51206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33678, 33697), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1573), -======= - id: DeclarationId(1572), ->>>>>>> origin/main + id: DeclarationId(1574), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61119,32 +51225,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 33702, 33751), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1574), -======= - id: DeclarationId(1573), ->>>>>>> origin/main - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(699), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 18570, 18578), - }); - declarations.push(Declaration { id: DeclarationId(1575), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(743), + DeclarationId(699), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -61155,10 +51239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 18627, 18636), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 19493, 19501), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1576), @@ -61212,7 +51293,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 20011, 20023), }); declarations.push(Declaration { - id: DeclarationId(1577), + id: DeclarationId(1579), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), @@ -61226,31 +51307,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 19409, 19424), - }); - declarations.push(Declaration { - id: DeclarationId(1579), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(996), - arguments: vec![TemplateArgument { - parameter: DeclarationId(997), - value: DeclarationId(642), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 23408, 23429), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 20332, 20347), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1580), @@ -61293,7 +51350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 24416, 24437), }); declarations.push(Declaration { - id: DeclarationId(1580), + id: DeclarationId(1582), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61307,11 +51364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 479, 489), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1582), -======= - id: DeclarationId(1581), ->>>>>>> origin/main + id: DeclarationId(1583), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61330,11 +51383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 494, 513), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1583), -======= - id: DeclarationId(1582), ->>>>>>> origin/main + id: DeclarationId(1584), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61348,11 +51397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 518, 528), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1584), -======= - id: DeclarationId(1583), ->>>>>>> origin/main + id: DeclarationId(1585), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(640), @@ -61369,11 +51414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1585), -======= - id: DeclarationId(1584), ->>>>>>> origin/main + id: DeclarationId(1586), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61392,11 +51433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 791, 802), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1586), -======= - id: DeclarationId(1585), ->>>>>>> origin/main + id: DeclarationId(1587), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61415,11 +51452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 807, 820), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1587), -======= - id: DeclarationId(1586), ->>>>>>> origin/main + id: DeclarationId(1588), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61438,11 +51471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 825, 842), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1588), -======= - id: DeclarationId(1587), ->>>>>>> origin/main + id: DeclarationId(1589), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61461,11 +51490,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2873, 2893), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1589), -======= - id: DeclarationId(1588), ->>>>>>> origin/main + id: DeclarationId(1590), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61484,11 +51509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2898, 2926), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1590), -======= - id: DeclarationId(1589), ->>>>>>> origin/main + id: DeclarationId(1591), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61507,11 +51528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2931, 2965), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1591), -======= - id: DeclarationId(1590), ->>>>>>> origin/main + id: DeclarationId(1592), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61530,11 +51547,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 2970, 2999), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1592), -======= - id: DeclarationId(1591), ->>>>>>> origin/main + id: DeclarationId(1593), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61553,11 +51566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3004, 3021), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1593), -======= - id: DeclarationId(1592), ->>>>>>> origin/main + id: DeclarationId(1594), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61571,11 +51580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3625, 3632), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1594), -======= - id: DeclarationId(1593), ->>>>>>> origin/main + id: DeclarationId(1595), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61594,11 +51599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 3637, 3687), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1595), -======= - id: DeclarationId(1594), ->>>>>>> origin/main + id: DeclarationId(1596), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61617,11 +51618,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5251, 5275), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1596), -======= - id: DeclarationId(1595), ->>>>>>> origin/main + id: DeclarationId(1597), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61635,11 +51632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5300, 5309), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1597), -======= - id: DeclarationId(1596), ->>>>>>> origin/main + id: DeclarationId(1598), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61658,11 +51651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5314, 5350), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1598), -======= - id: DeclarationId(1597), ->>>>>>> origin/main + id: DeclarationId(1599), name: None, connective: TypeConnective::Conj { children: vec![ @@ -61687,11 +51676,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5662, 5712), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1599), -======= - id: DeclarationId(1598), ->>>>>>> origin/main + id: DeclarationId(1600), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61705,11 +51690,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 5717, 5726), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1600), -======= - id: DeclarationId(1599), ->>>>>>> origin/main + id: DeclarationId(1601), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(704), @@ -61729,20 +51710,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6302, 6315), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1601), -======= - id: DeclarationId(1600), ->>>>>>> origin/main + id: DeclarationId(1602), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1600), -======= - ty: DeclarationId(1599), ->>>>>>> origin/main + ty: DeclarationId(1601), }], }, type_params: vec![], @@ -61756,11 +51729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6290, 6316), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1602), -======= - id: DeclarationId(1601), ->>>>>>> origin/main + id: DeclarationId(1603), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61774,11 +51743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6321, 6338), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1603), -======= - id: DeclarationId(1602), ->>>>>>> origin/main + id: DeclarationId(1604), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61797,11 +51762,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6589, 6599), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1604), -======= - id: DeclarationId(1603), ->>>>>>> origin/main + id: DeclarationId(1605), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61815,11 +51776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6604, 6613), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1605), -======= - id: DeclarationId(1604), ->>>>>>> origin/main + id: DeclarationId(1606), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61833,11 +51790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 6618, 6627), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1606), -======= - id: DeclarationId(1605), ->>>>>>> origin/main + id: DeclarationId(1607), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61856,11 +51809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7054, 7074), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1607), -======= - id: DeclarationId(1606), ->>>>>>> origin/main + id: DeclarationId(1608), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61879,11 +51828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7079, 7103), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1608), -======= - id: DeclarationId(1607), ->>>>>>> origin/main + id: DeclarationId(1609), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61903,20 +51848,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7115, 7131), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1609), -======= - id: DeclarationId(1608), ->>>>>>> origin/main + id: DeclarationId(1610), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1608), -======= - ty: DeclarationId(1607), ->>>>>>> origin/main + ty: DeclarationId(1609), }], }, type_params: vec![], @@ -61930,11 +51867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7108, 7132), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1610), -======= - id: DeclarationId(1609), ->>>>>>> origin/main + id: DeclarationId(1611), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61954,20 +51887,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7142, 7158), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1611), -======= - id: DeclarationId(1610), ->>>>>>> origin/main + id: DeclarationId(1612), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1610), -======= - ty: DeclarationId(1609), ->>>>>>> origin/main + ty: DeclarationId(1611), }], }, type_params: vec![], @@ -61981,11 +51906,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7137, 7159), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1612), -======= - id: DeclarationId(1611), ->>>>>>> origin/main + id: DeclarationId(1613), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62005,20 +51926,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7168, 7184), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1613), -======= - id: DeclarationId(1612), ->>>>>>> origin/main + id: DeclarationId(1614), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1612), -======= - ty: DeclarationId(1611), ->>>>>>> origin/main + ty: DeclarationId(1613), }], }, type_params: vec![], @@ -62032,11 +51945,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7164, 7185), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1614), -======= - id: DeclarationId(1613), ->>>>>>> origin/main + id: DeclarationId(1615), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62056,11 +51965,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7248, 7264), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1615), -======= - id: DeclarationId(1614), ->>>>>>> origin/main + id: DeclarationId(1616), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62070,11 +51975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "payload".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1614), -======= - ty: DeclarationId(1613), ->>>>>>> origin/main + ty: DeclarationId(1615), }, ], }, @@ -62089,11 +51990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7190, 7270), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1616), -======= - id: DeclarationId(1615), ->>>>>>> origin/main + id: DeclarationId(1617), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62112,50 +52009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7429, 7458), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1617), -======= - id: DeclarationId(1616), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(711), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 7493, 7509), - }); - declarations.push(Declaration { - id: DeclarationId(1617), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "fields".to_string(), - ty: DeclarationId(1616), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 7463, 7511), - }); - declarations.push(Declaration { id: DeclarationId(1618), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62179,13 +52033,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { name: None, connective: TypeConnective::Conj { children: vec![Field { -<<<<<<< HEAD label: "fields".to_string(), - ty: DeclarationId(1617), -======= - label: "_0".to_string(), ty: DeclarationId(1618), ->>>>>>> origin/main }], }, type_params: vec![], @@ -62199,7 +52048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7463, 7511), }); declarations.push(Declaration { - id: DeclarationId(1619), + id: DeclarationId(1620), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62219,12 +52068,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7529, 7545), }); declarations.push(Declaration { - id: DeclarationId(1620), + id: DeclarationId(1621), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(1619), + ty: DeclarationId(1620), }], }, type_params: vec![], @@ -62238,11 +52087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 7516, 7546), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1621), -======= - id: DeclarationId(1620), ->>>>>>> origin/main + id: DeclarationId(1622), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62261,11 +52106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8800, 8823), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1622), -======= - id: DeclarationId(1621), ->>>>>>> origin/main + id: DeclarationId(1623), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62281,25 +52122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 7905, 7939), - }); - declarations.push(Declaration { - id: DeclarationId(1623), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 7944, 7951), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 8828, 8862), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1624), @@ -62330,7 +52153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8879, 8885), }); declarations.push(Declaration { - id: DeclarationId(1624), + id: DeclarationId(1626), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62349,11 +52172,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 8890, 8910), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1626), -======= - id: DeclarationId(1625), ->>>>>>> origin/main + id: DeclarationId(1627), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62369,51 +52188,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 8216, 8233), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 9139, 9156), }); - declarations.push(Declaration { - id: DeclarationId(1626), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(709), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 9178, 9193), ->>>>>>> origin/main - }); - declarations.push(Declaration { - id: DeclarationId(1627), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "children".to_string(), - ty: DeclarationId(1626), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 9161, 9195), - }); declarations.push(Declaration { id: DeclarationId(1628), name: None, @@ -62432,24 +52208,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 8255, 8270), -======= - span: SourceSpan::new("src/v3/std/substrate.dag", 9217, 9232), ->>>>>>> origin/main + span: SourceSpan::new("src/v3/std/substrate.dag", 9178, 9193), }); declarations.push(Declaration { id: DeclarationId(1629), name: None, connective: TypeConnective::Conj { children: vec![Field { -<<<<<<< HEAD label: "children".to_string(), - ty: DeclarationId(1627), -======= - label: "variants".to_string(), ty: DeclarationId(1628), ->>>>>>> origin/main }], }, type_params: vec![], @@ -62460,11 +52227,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 8238, 8272), + span: SourceSpan::new("src/v3/std/substrate.dag", 9161, 9195), }); declarations.push(Declaration { - id: DeclarationId(1629), + id: DeclarationId(1630), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62481,15 +52247,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 8294, 8309), + span: SourceSpan::new("src/v3/std/substrate.dag", 9217, 9232), }); declarations.push(Declaration { - id: DeclarationId(1630), + id: DeclarationId(1631), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "variants".to_string(), - ty: DeclarationId(1629), + ty: DeclarationId(1630), }], }, type_params: vec![], @@ -62500,16 +52266,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 8277, 8311), - }); - declarations.push(Declaration { - id: DeclarationId(1631), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 9200, 9234), }); declarations.push(Declaration { - id: DeclarationId(1630), ->>>>>>> origin/main + id: DeclarationId(1632), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62529,21 +52289,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9261, 9280), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1632), -======= - id: DeclarationId(1631), ->>>>>>> origin/main + id: DeclarationId(1633), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1631), -======= - ty: DeclarationId(1630), ->>>>>>> origin/main + ty: DeclarationId(1632), }, Field { label: "output".to_string(), @@ -62566,11 +52318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9239, 9336), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1633), -======= - id: DeclarationId(1632), ->>>>>>> origin/main + id: DeclarationId(1634), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62595,11 +52343,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9341, 9419), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1634), -======= - id: DeclarationId(1633), ->>>>>>> origin/main + id: DeclarationId(1635), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62619,11 +52363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9487, 9509), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1635), -======= - id: DeclarationId(1634), ->>>>>>> origin/main + id: DeclarationId(1636), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62633,11 +52373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arguments".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1634), -======= - ty: DeclarationId(1633), ->>>>>>> origin/main + ty: DeclarationId(1635), }, ], }, @@ -62652,11 +52388,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9424, 9515), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1636), -======= - id: DeclarationId(1635), ->>>>>>> origin/main + id: DeclarationId(1637), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -62673,11 +52405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9564, 9571), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1637), -======= - id: DeclarationId(1636), ->>>>>>> origin/main + id: DeclarationId(1638), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62697,11 +52425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9616, 9635), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1638), -======= - id: DeclarationId(1637), ->>>>>>> origin/main + id: DeclarationId(1639), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62718,28 +52442,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 8731, 8753), - }); - declarations.push(Declaration { - id: DeclarationId(1639), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(642), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 8766, 8780), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 9654, 9676), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1640), @@ -62776,7 +52479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9716, 9730), }); declarations.push(Declaration { - id: DeclarationId(1640), + id: DeclarationId(1642), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(713), @@ -62793,11 +52496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9745, 9755), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1642), -======= - id: DeclarationId(1641), ->>>>>>> origin/main + id: DeclarationId(1643), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(719), @@ -62814,11 +52513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 9775, 9790), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1643), -======= - id: DeclarationId(1642), ->>>>>>> origin/main + id: DeclarationId(1644), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62835,25 +52530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 9990, 10009), - }); - declarations.push(Declaration { - id: DeclarationId(1644), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 10290, 10293), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 10913, 10932), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1645), @@ -63067,70 +52744,6 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(642), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11240, 11263), - }); - declarations.push(Declaration { - id: DeclarationId(1660), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(642), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11328, 11342), - }); - declarations.push(Declaration { - id: DeclarationId(1661), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "field_label".to_string(), - ty: DeclarationId(197), - }, - Field { - label: "field_child".to_string(), - ty: DeclarationId(1660), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 11268, 11348), - }); - declarations.push(Declaration { - id: DeclarationId(1662), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), -======= ->>>>>>> origin/main ty: DeclarationId(722), }], }, @@ -63145,7 +52758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11958, 11976), }); declarations.push(Declaration { - id: DeclarationId(1658), + id: DeclarationId(1660), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -63164,7 +52777,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12163, 12186), }); declarations.push(Declaration { - id: DeclarationId(1659), + id: DeclarationId(1661), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(642), @@ -63181,7 +52794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12251, 12265), }); declarations.push(Declaration { - id: DeclarationId(1660), + id: DeclarationId(1662), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63191,7 +52804,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "field_child".to_string(), - ty: DeclarationId(1659), + ty: DeclarationId(1661), }, ], }, @@ -63225,7 +52838,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12276, 12298), }); declarations.push(Declaration { - id: DeclarationId(1662), + id: DeclarationId(1664), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63250,11 +52863,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12423, 12475), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1664), -======= - id: DeclarationId(1663), ->>>>>>> origin/main + id: DeclarationId(1665), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -63273,11 +52882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12480, 12510), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1665), -======= - id: DeclarationId(1664), ->>>>>>> origin/main + id: DeclarationId(1666), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(726), @@ -63291,31 +52896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 11751, 11766), - }); - declarations.push(Declaration { - id: DeclarationId(1666), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(646), - arguments: vec![TemplateArgument { - parameter: DeclarationId(647), - value: DeclarationId(731), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 13742, 13773), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 12674, 12689), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1667), @@ -63358,7 +52939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 14720, 14750), }); declarations.push(Declaration { - id: DeclarationId(1667), + id: DeclarationId(1669), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -63377,11 +52958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15373, 15402), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1669), -======= - id: DeclarationId(1668), ->>>>>>> origin/main + id: DeclarationId(1670), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63403,140 +52980,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 14484, 14531), - }); - declarations.push(Declaration { - id: DeclarationId(1670), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(673), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 14800, 14815), -======= span: SourceSpan::new("src/v3/std/substrate.dag", 15407, 15454), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1671), name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(641), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 14889, 14901), - }); - declarations.push(Declaration { - id: DeclarationId(1672), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15142, 15151), - }); - declarations.push(Declaration { - id: DeclarationId(1673), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(726), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15209, 15225), - }); - declarations.push(Declaration { - id: DeclarationId(1674), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(738), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15289, 15313), - }); - declarations.push(Declaration { - id: DeclarationId(1675), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15727, 15739), - }); - declarations.push(Declaration { - id: DeclarationId(1676), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(641), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15817, 15829), - }); - declarations.push(Declaration { - id: DeclarationId(1677), - name: None, -======= ->>>>>>> origin/main connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), CardinalityBound::AtMostOne, @@ -63552,7 +53000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15723, 15738), }); declarations.push(Declaration { - id: DeclarationId(1670), + id: DeclarationId(1672), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63572,7 +53020,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15812, 15824), }); declarations.push(Declaration { - id: DeclarationId(1671), + id: DeclarationId(1673), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63586,7 +53034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16065, 16074), }); declarations.push(Declaration { - id: DeclarationId(1672), + id: DeclarationId(1674), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63606,7 +53054,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16132, 16148), }); declarations.push(Declaration { - id: DeclarationId(1673), + id: DeclarationId(1675), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(739), @@ -63623,7 +53071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16212, 16236), }); declarations.push(Declaration { - id: DeclarationId(1674), + id: DeclarationId(1676), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63637,7 +53085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 16650, 16662), }); declarations.push(Declaration { - id: DeclarationId(1675), + id: DeclarationId(1677), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63826,7 +53274,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17104, 17118), }); declarations.push(Declaration { - id: DeclarationId(1685), + id: DeclarationId(1687), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63846,11 +53294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17128, 17141), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1687), -======= - id: DeclarationId(1686), ->>>>>>> origin/main + id: DeclarationId(1688), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63870,11 +53314,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 17154, 17167), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1688), -======= - id: DeclarationId(1687), ->>>>>>> origin/main + id: DeclarationId(1689), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -63893,11 +53333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22373, 22391), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1689), -======= - id: DeclarationId(1688), ->>>>>>> origin/main + id: DeclarationId(1690), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63911,11 +53347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22396, 22402), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1690), -======= - id: DeclarationId(1689), ->>>>>>> origin/main + id: DeclarationId(1691), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -63935,20 +53367,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22435, 22459), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1691), -======= - id: DeclarationId(1690), ->>>>>>> origin/main + id: DeclarationId(1692), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "candidates".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1690), -======= - ty: DeclarationId(1689), ->>>>>>> origin/main + ty: DeclarationId(1691), }], }, type_params: vec![], @@ -63962,11 +53386,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22407, 22461), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1692), -======= - id: DeclarationId(1691), ->>>>>>> origin/main + id: DeclarationId(1693), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -63986,11 +53406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9849, 9869), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1693), -======= - id: DeclarationId(1692), ->>>>>>> origin/main + id: DeclarationId(1694), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -64010,11 +53426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 9933, 9953), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1694), -======= - id: DeclarationId(1693), ->>>>>>> origin/main + id: DeclarationId(1695), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -64034,11 +53446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10021, 10051), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1695), -======= - id: DeclarationId(1694), ->>>>>>> origin/main + id: DeclarationId(1696), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64058,11 +53466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10518, 10536), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1696), -======= - id: DeclarationId(1695), ->>>>>>> origin/main + id: DeclarationId(1697), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -64082,11 +53486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10542, 10572), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1697), -======= - id: DeclarationId(1696), ->>>>>>> origin/main + id: DeclarationId(1698), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64106,11 +53506,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13069, 13087), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1698), -======= - id: DeclarationId(1697), ->>>>>>> origin/main + id: DeclarationId(1699), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -64130,11 +53526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17290, 17320), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1699), -======= - id: DeclarationId(1698), ->>>>>>> origin/main + id: DeclarationId(1700), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64154,11 +53546,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17325, 17343), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1700), -======= - id: DeclarationId(1699), ->>>>>>> origin/main + id: DeclarationId(1701), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64178,11 +53566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17594, 17612), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1701), -======= - id: DeclarationId(1700), ->>>>>>> origin/main + id: DeclarationId(1702), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64202,11 +53586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17617, 17635), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1702), -======= - id: DeclarationId(1701), ->>>>>>> origin/main + id: DeclarationId(1703), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64226,11 +53606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 18901, 18919), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1703), -======= - id: DeclarationId(1702), ->>>>>>> origin/main + id: DeclarationId(1704), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64250,11 +53626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19172, 19190), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1704), -======= - id: DeclarationId(1703), ->>>>>>> origin/main + id: DeclarationId(1705), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64274,11 +53646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19638, 19656), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1705), -======= - id: DeclarationId(1704), ->>>>>>> origin/main + id: DeclarationId(1706), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64298,11 +53666,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21673, 21691), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1706), -======= - id: DeclarationId(1705), ->>>>>>> origin/main + id: DeclarationId(1707), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64322,11 +53686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21721, 21739), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1707), -======= - id: DeclarationId(1706), ->>>>>>> origin/main + id: DeclarationId(1708), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64346,11 +53706,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22026, 22044), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1708), -======= - id: DeclarationId(1707), ->>>>>>> origin/main + id: DeclarationId(1709), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64370,11 +53726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22072, 22090), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1709), -======= - id: DeclarationId(1708), ->>>>>>> origin/main + id: DeclarationId(1710), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64394,11 +53746,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22450, 22468), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1710), -======= - id: DeclarationId(1709), ->>>>>>> origin/main + id: DeclarationId(1711), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -64418,11 +53766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22473, 22491), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1711), -======= - id: DeclarationId(1710), ->>>>>>> origin/main + id: DeclarationId(1712), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64436,11 +53780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4805, 4817), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1712), -======= - id: DeclarationId(1711), ->>>>>>> origin/main + id: DeclarationId(1713), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64454,11 +53794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4822, 4838), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1713), -======= - id: DeclarationId(1712), ->>>>>>> origin/main + id: DeclarationId(1714), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64472,11 +53808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 4843, 4857), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1714), -======= - id: DeclarationId(1713), ->>>>>>> origin/main + id: DeclarationId(1715), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64490,11 +53822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5707, 5720), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1715), -======= - id: DeclarationId(1714), ->>>>>>> origin/main + id: DeclarationId(1716), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64508,11 +53836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5725, 5740), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1716), -======= - id: DeclarationId(1715), ->>>>>>> origin/main + id: DeclarationId(1717), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64526,11 +53850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5745, 5761), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1717), -======= - id: DeclarationId(1716), ->>>>>>> origin/main + id: DeclarationId(1718), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64544,28 +53864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 5766, 5779), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1718), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(757), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 6632, 6653), - }); - declarations.push(Declaration { id: DeclarationId(1719), -======= - id: DeclarationId(1717), ->>>>>>> origin/main name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(758), @@ -64599,7 +53898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6668, 6678), }); declarations.push(Declaration { - id: DeclarationId(1719), + id: DeclarationId(1721), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -64616,11 +53915,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6708, 6712), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1721), -======= - id: DeclarationId(1720), ->>>>>>> origin/main + id: DeclarationId(1722), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64634,11 +53929,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8181, 8190), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1722), -======= - id: DeclarationId(1721), ->>>>>>> origin/main + id: DeclarationId(1723), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64657,11 +53948,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8195, 8241), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1723), -======= - id: DeclarationId(1722), ->>>>>>> origin/main + id: DeclarationId(1724), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64680,11 +53967,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8413, 8430), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1724), -======= - id: DeclarationId(1723), ->>>>>>> origin/main + id: DeclarationId(1725), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64703,11 +53986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8435, 8459), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1725), -======= - id: DeclarationId(1724), ->>>>>>> origin/main + id: DeclarationId(1726), name: None, connective: TypeConnective::Conj { children: vec![ @@ -64732,11 +54011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8464, 8526), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1726), -======= - id: DeclarationId(1725), ->>>>>>> origin/main + id: DeclarationId(1727), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -64756,20 +54031,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8543, 8573), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1727), -======= - id: DeclarationId(1726), ->>>>>>> origin/main + id: DeclarationId(1728), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1726), -======= - ty: DeclarationId(1725), ->>>>>>> origin/main + ty: DeclarationId(1727), }], }, type_params: vec![], @@ -64783,11 +54050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8531, 8574), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1728), -======= - id: DeclarationId(1727), ->>>>>>> origin/main + id: DeclarationId(1729), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -64807,20 +54070,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8587, 8617), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1729), -======= - id: DeclarationId(1728), ->>>>>>> origin/main + id: DeclarationId(1730), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1728), -======= - ty: DeclarationId(1727), ->>>>>>> origin/main + ty: DeclarationId(1729), }], }, type_params: vec![], @@ -64834,11 +54089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8579, 8618), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1730), -======= - id: DeclarationId(1729), ->>>>>>> origin/main + id: DeclarationId(1731), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64857,11 +54108,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8623, 8644), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1731), -======= - id: DeclarationId(1730), ->>>>>>> origin/main + id: DeclarationId(1732), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64880,11 +54127,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 8649, 8668), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1732), -======= - id: DeclarationId(1731), ->>>>>>> origin/main + id: DeclarationId(1733), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -64904,11 +54147,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1733), -======= - id: DeclarationId(1732), ->>>>>>> origin/main + id: DeclarationId(1734), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(647)], @@ -64926,11 +54165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 5879, 5892), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1734), -======= - id: DeclarationId(1733), ->>>>>>> origin/main + id: DeclarationId(1735), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(623), @@ -64940,13 +54175,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(763), }, TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(1489), - value: DeclarationId(769), -======= - parameter: DeclarationId(1488), + parameter: DeclarationId(1490), value: DeclarationId(770), ->>>>>>> origin/main }, ], }, @@ -64961,11 +54191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1735), -======= - id: DeclarationId(1734), ->>>>>>> origin/main + id: DeclarationId(1736), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -64985,11 +54211,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1736), -======= - id: DeclarationId(1735), ->>>>>>> origin/main + id: DeclarationId(1737), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(763)], @@ -65007,10 +54229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1737), -======= - id: DeclarationId(1736), + id: DeclarationId(1738), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -65024,7 +54243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(763), }, TemplateArgument { - parameter: DeclarationId(1478), + parameter: DeclarationId(1480), value: DeclarationId(774), }, ], @@ -65040,7 +54259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), }); declarations.push(Declaration { - id: DeclarationId(1737), + id: DeclarationId(1739), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(764), DeclarationId(613)], @@ -65058,32 +54277,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1738), ->>>>>>> origin/main + id: DeclarationId(1740), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), arguments: vec![ TemplateArgument { parameter: DeclarationId(614), -<<<<<<< HEAD - value: DeclarationId(762), -======= value: DeclarationId(764), }, TemplateArgument { - parameter: DeclarationId(1478), + parameter: DeclarationId(1480), value: DeclarationId(791), ->>>>>>> origin/main }, TemplateArgument { parameter: DeclarationId(613), value: DeclarationId(763), }, - TemplateArgument { - parameter: DeclarationId(1479), - value: DeclarationId(773), - }, ], }, type_params: vec![], @@ -65094,10 +54304,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), + span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), }); declarations.push(Declaration { - id: DeclarationId(1739), + id: DeclarationId(1741), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(764), DeclarationId(613)], @@ -65115,7 +54325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { - id: DeclarationId(1740), + id: DeclarationId(1742), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -65125,61 +54335,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(764), }, TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(1479), - value: DeclarationId(790), - }, - TemplateArgument { - parameter: DeclarationId(613), - value: DeclarationId(762), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), - }); - declarations.push(Declaration { - id: DeclarationId(1740), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(763), DeclarationId(613)], - output: DeclarationId(763), - body: ArrowBody::NoBody, - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), - }); - declarations.push(Declaration { - id: DeclarationId(1741), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(612), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(614), - value: DeclarationId(763), - }, - TemplateArgument { - parameter: DeclarationId(1479), - value: DeclarationId(790), -======= - parameter: DeclarationId(1478), + parameter: DeclarationId(1480), value: DeclarationId(791), ->>>>>>> origin/main }, TemplateArgument { parameter: DeclarationId(613), @@ -65198,11 +54355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1742), -======= - id: DeclarationId(1741), ->>>>>>> origin/main + id: DeclarationId(1743), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -65222,11 +54375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1743), -======= - id: DeclarationId(1742), ->>>>>>> origin/main + id: DeclarationId(1744), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -65246,11 +54395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1744), -======= - id: DeclarationId(1743), ->>>>>>> origin/main + id: DeclarationId(1745), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -65270,11 +54415,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1745), -======= - id: DeclarationId(1744), ->>>>>>> origin/main + id: DeclarationId(1746), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -65294,11 +54435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1746), -======= - id: DeclarationId(1745), ->>>>>>> origin/main + id: DeclarationId(1747), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -65318,11 +54455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1747), -======= - id: DeclarationId(1746), ->>>>>>> origin/main + id: DeclarationId(1748), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -65342,11 +54475,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1748), -======= - id: DeclarationId(1747), ->>>>>>> origin/main + id: DeclarationId(1749), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -65366,11 +54495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1749), -======= - id: DeclarationId(1748), ->>>>>>> origin/main + id: DeclarationId(1750), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(764), DeclarationId(763)], @@ -65388,11 +54513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1750), -======= - id: DeclarationId(1749), ->>>>>>> origin/main + id: DeclarationId(1751), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -65406,13 +54527,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value: DeclarationId(763), }, TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(1479), - value: DeclarationId(790), -======= - parameter: DeclarationId(1478), + parameter: DeclarationId(1480), value: DeclarationId(791), ->>>>>>> origin/main }, ], }, @@ -65427,11 +54543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1751), -======= - id: DeclarationId(1750), ->>>>>>> origin/main + id: DeclarationId(1752), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -65451,11 +54563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1752), -======= - id: DeclarationId(1751), ->>>>>>> origin/main + id: DeclarationId(1753), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -65475,19 +54583,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1753), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1710), DeclarationId(762)], - output: DeclarationId(1710), -======= - id: DeclarationId(1752), + id: DeclarationId(1754), name: None, connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(1709), DeclarationId(763)], - output: DeclarationId(1709), ->>>>>>> origin/main + inputs: vec![DeclarationId(1711), DeclarationId(763)], + output: DeclarationId(1711), body: ArrowBody::NoBody, }, type_params: vec![], @@ -65501,35 +54601,22 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/list.dag", 4183, 4196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1754), -======= - id: DeclarationId(1753), ->>>>>>> origin/main + id: DeclarationId(1755), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), arguments: vec![ TemplateArgument { parameter: DeclarationId(614), -<<<<<<< HEAD - value: DeclarationId(1710), -======= - value: DeclarationId(1709), ->>>>>>> origin/main + value: DeclarationId(1711), }, TemplateArgument { parameter: DeclarationId(613), value: DeclarationId(763), }, TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(1479), - value: DeclarationId(793), -======= - parameter: DeclarationId(1478), + parameter: DeclarationId(1480), value: DeclarationId(794), ->>>>>>> origin/main }, ], }, @@ -65544,87 +54631,8 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1755), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(797), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529), - }); - declarations.push(Declaration { id: DeclarationId(1756), name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(86), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), - }); - declarations.push(Declaration { - id: DeclarationId(1757), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(197), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), - }); - declarations.push(Declaration { - id: DeclarationId(1758), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(1032), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), - }); - declarations.push(Declaration { - id: DeclarationId(1759), - name: None, -======= - id: DeclarationId(1754), - name: None, ->>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { @@ -65643,15 +54651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4503, 4529), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1760), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "content".to_string(), - ty: DeclarationId(1759), -======= - id: DeclarationId(1755), + id: DeclarationId(1757), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(86), @@ -65668,7 +54668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(1756), + id: DeclarationId(1758), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -65685,14 +54685,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(1757), + id: DeclarationId(1759), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1031), ->>>>>>> origin/main + value: DeclarationId(1033), }], }, type_params: vec![], @@ -65706,11 +54705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_operations.dag", 6542, 6557), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1761), -======= - id: DeclarationId(1758), ->>>>>>> origin/main + id: DeclarationId(1760), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -65730,19 +54725,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2549, 2580), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1762), -======= - id: DeclarationId(1759), ->>>>>>> origin/main + id: DeclarationId(1761), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1761), -======= - ty: DeclarationId(1758), + ty: DeclarationId(1760), }], }, type_params: vec![], @@ -65756,7 +54744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2521, 2582), }); declarations.push(Declaration { - id: DeclarationId(1760), + id: DeclarationId(1762), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -65776,13 +54764,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2615, 2651), }); declarations.push(Declaration { - id: DeclarationId(1761), + id: DeclarationId(1763), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), - ty: DeclarationId(1760), ->>>>>>> origin/main + ty: DeclarationId(1762), }], }, type_params: vec![], @@ -65796,11 +54783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 2587, 2653), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1763), -======= - id: DeclarationId(1762), ->>>>>>> origin/main + id: DeclarationId(1764), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65819,11 +54802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3068, 3104), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1764), -======= - id: DeclarationId(1763), ->>>>>>> origin/main + id: DeclarationId(1765), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(99), @@ -65840,11 +54819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3179, 3184), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1765), -======= - id: DeclarationId(1764), ->>>>>>> origin/main + id: DeclarationId(1766), name: None, connective: TypeConnective::Conj { children: vec![ @@ -65858,11 +54833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "is_error".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1764), -======= - ty: DeclarationId(1763), ->>>>>>> origin/main + ty: DeclarationId(1765), }, ], }, @@ -65877,11 +54848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3109, 3186), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1766), -======= - id: DeclarationId(1765), ->>>>>>> origin/main + id: DeclarationId(1767), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65900,11 +54867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3633, 3671), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1767), -======= - id: DeclarationId(1766), ->>>>>>> origin/main + id: DeclarationId(1768), name: None, connective: TypeConnective::Conj { children: vec![ @@ -65933,11 +54896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 3676, 3739), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1768), -======= - id: DeclarationId(1767), ->>>>>>> origin/main + id: DeclarationId(1769), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -65951,11 +54910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4097, 4104), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1769), -======= - id: DeclarationId(1768), ->>>>>>> origin/main + id: DeclarationId(1770), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -65969,11 +54924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4109, 4118), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1770), -======= - id: DeclarationId(1769), ->>>>>>> origin/main + id: DeclarationId(1771), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -65987,11 +54938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4123, 4135), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1771), -======= - id: DeclarationId(1770), ->>>>>>> origin/main + id: DeclarationId(1772), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66005,11 +54952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4140, 4147), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1772), -======= - id: DeclarationId(1771), ->>>>>>> origin/main + id: DeclarationId(1773), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66023,11 +54966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4152, 4161), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1773), -======= - id: DeclarationId(1772), ->>>>>>> origin/main + id: DeclarationId(1774), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66041,11 +54980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4166, 4173), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1774), -======= - id: DeclarationId(1773), ->>>>>>> origin/main + id: DeclarationId(1775), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66059,11 +54994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4178, 4204), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1775), -======= - id: DeclarationId(1774), ->>>>>>> origin/main + id: DeclarationId(1776), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -66083,11 +55014,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5538, 5573), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1776), -======= - id: DeclarationId(1775), ->>>>>>> origin/main + id: DeclarationId(1777), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -66104,11 +55031,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5652, 5659), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1777), -======= - id: DeclarationId(1776), ->>>>>>> origin/main + id: DeclarationId(1778), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66122,11 +55045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1207, 1220), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1778), -======= - id: DeclarationId(1777), ->>>>>>> origin/main + id: DeclarationId(1779), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66140,11 +55059,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1225, 1231), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1779), -======= - id: DeclarationId(1778), ->>>>>>> origin/main + id: DeclarationId(1780), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66158,11 +55073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1236, 1254), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1780), -======= - id: DeclarationId(1779), ->>>>>>> origin/main + id: DeclarationId(1781), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66176,11 +55087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1259, 1277), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1781), -======= - id: DeclarationId(1780), ->>>>>>> origin/main + id: DeclarationId(1782), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66194,11 +55101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1282, 1296), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1782), -======= - id: DeclarationId(1781), ->>>>>>> origin/main + id: DeclarationId(1783), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66212,11 +55115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1578, 1587), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1783), -======= - id: DeclarationId(1782), ->>>>>>> origin/main + id: DeclarationId(1784), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66241,11 +55140,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1592, 1669), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1784), -======= - id: DeclarationId(1783), ->>>>>>> origin/main + id: DeclarationId(1785), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66270,11 +55165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1674, 1744), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1785), -======= - id: DeclarationId(1784), ->>>>>>> origin/main + id: DeclarationId(1786), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66288,11 +55179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1984, 1989), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1786), -======= - id: DeclarationId(1785), ->>>>>>> origin/main + id: DeclarationId(1787), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66306,11 +55193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 1992, 2000), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1787), -======= - id: DeclarationId(1786), ->>>>>>> origin/main + id: DeclarationId(1788), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66324,11 +55207,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2003, 2023), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1788), -======= - id: DeclarationId(1787), ->>>>>>> origin/main + id: DeclarationId(1789), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66342,11 +55221,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2273, 2283), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1789), -======= - id: DeclarationId(1788), ->>>>>>> origin/main + id: DeclarationId(1790), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66360,11 +55235,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2286, 2300), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1790), -======= - id: DeclarationId(1789), ->>>>>>> origin/main + id: DeclarationId(1791), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66378,11 +55249,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2555, 2567), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1791), -======= - id: DeclarationId(1790), ->>>>>>> origin/main + id: DeclarationId(1792), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66396,11 +55263,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2570, 2580), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1792), -======= - id: DeclarationId(1791), ->>>>>>> origin/main + id: DeclarationId(1793), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66414,11 +55277,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2898, 2910), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1793), -======= - id: DeclarationId(1792), ->>>>>>> origin/main + id: DeclarationId(1794), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66432,11 +55291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2913, 2929), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1794), -======= - id: DeclarationId(1793), ->>>>>>> origin/main + id: DeclarationId(1795), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66450,11 +55305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 2932, 2943), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1795), -======= - id: DeclarationId(1794), ->>>>>>> origin/main + id: DeclarationId(1796), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(39), @@ -66474,11 +55325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/approximate_field.dag", 3588, 3596), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1796), -======= - id: DeclarationId(1795), ->>>>>>> origin/main + id: DeclarationId(1797), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66492,11 +55339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1013, 1025), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1797), -======= - id: DeclarationId(1796), ->>>>>>> origin/main + id: DeclarationId(1798), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66510,11 +55353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1030, 1044), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1798), -======= - id: DeclarationId(1797), ->>>>>>> origin/main + id: DeclarationId(1799), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66528,11 +55367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1049, 1064), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1799), -======= - id: DeclarationId(1798), ->>>>>>> origin/main + id: DeclarationId(1800), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66546,11 +55381,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1069, 1086), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1800), -======= - id: DeclarationId(1799), ->>>>>>> origin/main + id: DeclarationId(1801), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66564,11 +55395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bootstrap_authority.dag", 1091, 1114), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1801), -======= - id: DeclarationId(1800), ->>>>>>> origin/main + id: DeclarationId(1802), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66582,11 +55409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4314, 4321), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1802), -======= - id: DeclarationId(1801), ->>>>>>> origin/main + id: DeclarationId(1803), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66600,11 +55423,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 4326, 4330), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1803), -======= - id: DeclarationId(1802), ->>>>>>> origin/main + id: DeclarationId(1804), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -66624,11 +55443,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6578, 6599), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1804), -======= - id: DeclarationId(1803), ->>>>>>> origin/main + id: DeclarationId(1805), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66642,11 +55457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2224, 2238), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1805), -======= - id: DeclarationId(1804), ->>>>>>> origin/main + id: DeclarationId(1806), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66660,11 +55471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2243, 2268), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1806), -======= - id: DeclarationId(1805), ->>>>>>> origin/main + id: DeclarationId(1807), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66678,11 +55485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2273, 2283), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1807), -======= - id: DeclarationId(1806), ->>>>>>> origin/main + id: DeclarationId(1808), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66696,11 +55499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2548, 2565), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1808), -======= - id: DeclarationId(1807), ->>>>>>> origin/main + id: DeclarationId(1809), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66714,11 +55513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2570, 2594), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1809), -======= - id: DeclarationId(1808), ->>>>>>> origin/main + id: DeclarationId(1810), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66732,11 +55527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2599, 2631), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1810), -======= - id: DeclarationId(1809), ->>>>>>> origin/main + id: DeclarationId(1811), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66750,11 +55541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 2636, 2663), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1811), -======= - id: DeclarationId(1810), ->>>>>>> origin/main + id: DeclarationId(1812), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66768,11 +55555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3369, 3393), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1812), -======= - id: DeclarationId(1811), ->>>>>>> origin/main + id: DeclarationId(1813), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66786,11 +55569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3398, 3430), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1813), -======= - id: DeclarationId(1812), ->>>>>>> origin/main + id: DeclarationId(1814), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66804,11 +55583,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3564, 3588), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1814), -======= - id: DeclarationId(1813), ->>>>>>> origin/main + id: DeclarationId(1815), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66822,11 +55597,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3593, 3614), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1815), -======= - id: DeclarationId(1814), ->>>>>>> origin/main + id: DeclarationId(1816), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66840,11 +55611,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3619, 3637), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1816), -======= - id: DeclarationId(1815), ->>>>>>> origin/main + id: DeclarationId(1817), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66858,11 +55625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3781, 3796), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1817), -======= - id: DeclarationId(1816), ->>>>>>> origin/main + id: DeclarationId(1818), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66876,11 +55639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3801, 3831), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1818), -======= - id: DeclarationId(1817), ->>>>>>> origin/main + id: DeclarationId(1819), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66894,11 +55653,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 3836, 3857), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1819), -======= - id: DeclarationId(1818), ->>>>>>> origin/main + id: DeclarationId(1820), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66912,11 +55667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4024, 4044), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1820), -======= - id: DeclarationId(1819), ->>>>>>> origin/main + id: DeclarationId(1821), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66930,11 +55681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4049, 4076), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1821), -======= - id: DeclarationId(1820), ->>>>>>> origin/main + id: DeclarationId(1822), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66948,11 +55695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4081, 4095), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1822), -======= - id: DeclarationId(1821), ->>>>>>> origin/main + id: DeclarationId(1823), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66966,11 +55709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4354, 4362), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1823), -======= - id: DeclarationId(1822), ->>>>>>> origin/main + id: DeclarationId(1824), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66984,11 +55723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4367, 4393), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1824), -======= - id: DeclarationId(1823), ->>>>>>> origin/main + id: DeclarationId(1825), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67002,11 +55737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 4398, 4423), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1825), -======= - id: DeclarationId(1824), ->>>>>>> origin/main + id: DeclarationId(1826), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -67026,11 +55757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5320, 5332), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1826), -======= - id: DeclarationId(1825), ->>>>>>> origin/main + id: DeclarationId(1827), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67044,11 +55771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5693, 5713), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1827), -======= - id: DeclarationId(1826), ->>>>>>> origin/main + id: DeclarationId(1828), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67062,11 +55785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5718, 5736), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1828), -======= - id: DeclarationId(1827), ->>>>>>> origin/main + id: DeclarationId(1829), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67080,11 +55799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5741, 5759), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1829), -======= - id: DeclarationId(1828), ->>>>>>> origin/main + id: DeclarationId(1830), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67098,11 +55813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/clean_emission.dag", 5764, 5791), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1830), -======= - id: DeclarationId(1829), ->>>>>>> origin/main + id: DeclarationId(1831), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -67119,11 +55830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5361, 5368), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1831), -======= - id: DeclarationId(1830), ->>>>>>> origin/main + id: DeclarationId(1832), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -67140,11 +55847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6292, 6296), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1832), -======= - id: DeclarationId(1831), ->>>>>>> origin/main + id: DeclarationId(1833), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(846), @@ -67161,11 +55864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7350, 7369), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1833), -======= - id: DeclarationId(1832), ->>>>>>> origin/main + id: DeclarationId(1834), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(846), @@ -67182,11 +55881,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7915, 7934), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1834), -======= - id: DeclarationId(1833), ->>>>>>> origin/main + id: DeclarationId(1835), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67205,11 +55900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1356, 1388), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1835), -======= - id: DeclarationId(1834), ->>>>>>> origin/main + id: DeclarationId(1836), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67228,11 +55919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1393, 1429), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1836), -======= - id: DeclarationId(1835), ->>>>>>> origin/main + id: DeclarationId(1837), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67251,11 +55938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1434, 1471), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1837), -======= - id: DeclarationId(1836), ->>>>>>> origin/main + id: DeclarationId(1838), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67274,11 +55957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1476, 1502), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1838), -======= - id: DeclarationId(1837), ->>>>>>> origin/main + id: DeclarationId(1839), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67297,11 +55976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1507, 1540), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1839), -======= - id: DeclarationId(1838), ->>>>>>> origin/main + id: DeclarationId(1840), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67315,20 +55990,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1545, 1562), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1840), -======= - id: DeclarationId(1839), ->>>>>>> origin/main + id: DeclarationId(1841), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }], }, type_params: vec![], @@ -67342,11 +56009,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1567, 1621), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1841), -======= - id: DeclarationId(1840), ->>>>>>> origin/main + id: DeclarationId(1842), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67360,11 +56023,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 1626, 1633), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1842), -======= - id: DeclarationId(1841), ->>>>>>> origin/main + id: DeclarationId(1843), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67383,21 +56042,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2165, 2203), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1843), -======= - id: DeclarationId(1842), ->>>>>>> origin/main + id: DeclarationId(1844), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "amount".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }, Field { label: "collection".to_string(), @@ -67416,21 +56067,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2208, 2282), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1844), -======= - id: DeclarationId(1843), ->>>>>>> origin/main + id: DeclarationId(1845), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }, Field { label: "ring_param".to_string(), @@ -67449,21 +56092,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2287, 2362), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1845), -======= - id: DeclarationId(1844), ->>>>>>> origin/main + id: DeclarationId(1846), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "divisor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1042), -======= - ty: DeclarationId(1041), ->>>>>>> origin/main + ty: DeclarationId(1043), }, Field { label: "ring_param".to_string(), @@ -67482,11 +56117,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2367, 2440), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1846), -======= - id: DeclarationId(1845), ->>>>>>> origin/main + id: DeclarationId(1847), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67505,11 +56136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2445, 2482), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1847), -======= - id: DeclarationId(1846), ->>>>>>> origin/main + id: DeclarationId(1848), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67528,11 +56155,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2487, 2524), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1848), -======= - id: DeclarationId(1847), ->>>>>>> origin/main + id: DeclarationId(1849), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67551,11 +56174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2529, 2570), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1849), -======= - id: DeclarationId(1848), ->>>>>>> origin/main + id: DeclarationId(1850), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67569,11 +56188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2575, 2591), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1850), -======= - id: DeclarationId(1849), ->>>>>>> origin/main + id: DeclarationId(1851), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67587,20 +56202,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2803, 2813), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1851), -======= - id: DeclarationId(1850), ->>>>>>> origin/main + id: DeclarationId(1852), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }], }, type_params: vec![], @@ -67614,20 +56221,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2818, 2865), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1852), -======= - id: DeclarationId(1851), ->>>>>>> origin/main + id: DeclarationId(1853), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1042), -======= - ty: DeclarationId(1041), ->>>>>>> origin/main + ty: DeclarationId(1043), }], }, type_params: vec![], @@ -67641,11 +56240,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2870, 2921), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1853), -======= - id: DeclarationId(1852), ->>>>>>> origin/main + id: DeclarationId(1854), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67659,11 +56254,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3111, 3115), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1854), -======= - id: DeclarationId(1853), ->>>>>>> origin/main + id: DeclarationId(1855), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67677,11 +56268,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3120, 3127), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1855), -======= - id: DeclarationId(1854), ->>>>>>> origin/main + id: DeclarationId(1856), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67695,11 +56282,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3132, 3138), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1856), -======= - id: DeclarationId(1855), ->>>>>>> origin/main + id: DeclarationId(1857), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(838), @@ -67716,11 +56299,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3441, 3454), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1857), -======= - id: DeclarationId(1856), ->>>>>>> origin/main + id: DeclarationId(1858), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67734,11 +56313,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7082, 7093), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1858), -======= - id: DeclarationId(1857), ->>>>>>> origin/main + id: DeclarationId(1859), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67752,11 +56327,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7142, 7156), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1859), -======= - id: DeclarationId(1858), ->>>>>>> origin/main + id: DeclarationId(1860), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67770,11 +56341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7221, 7237), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1860), -======= - id: DeclarationId(1859), ->>>>>>> origin/main + id: DeclarationId(1861), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67788,11 +56355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 360, 369), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1861), -======= - id: DeclarationId(1860), ->>>>>>> origin/main + id: DeclarationId(1862), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67806,11 +56369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 374, 381), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1862), -======= - id: DeclarationId(1861), ->>>>>>> origin/main + id: DeclarationId(1863), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67824,11 +56383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 614, 618), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1863), -======= - id: DeclarationId(1862), ->>>>>>> origin/main + id: DeclarationId(1864), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67842,11 +56397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 623, 632), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1864), -======= - id: DeclarationId(1863), ->>>>>>> origin/main + id: DeclarationId(1865), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67860,11 +56411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 910, 921), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1865), -======= - id: DeclarationId(1864), ->>>>>>> origin/main + id: DeclarationId(1866), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67878,11 +56425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 926, 935), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1866), -======= - id: DeclarationId(1865), ->>>>>>> origin/main + id: DeclarationId(1867), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67896,11 +56439,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1166, 1173), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1867), -======= - id: DeclarationId(1866), ->>>>>>> origin/main + id: DeclarationId(1868), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67914,11 +56453,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 1178, 1187), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1868), -======= - id: DeclarationId(1867), ->>>>>>> origin/main + id: DeclarationId(1869), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67932,11 +56467,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2035, 2044), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1869), -======= - id: DeclarationId(1868), ->>>>>>> origin/main + id: DeclarationId(1870), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67950,11 +56481,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2049, 2065), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1870), -======= - id: DeclarationId(1869), ->>>>>>> origin/main + id: DeclarationId(1871), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67968,11 +56495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2070, 2080), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1871), -======= - id: DeclarationId(1870), ->>>>>>> origin/main + id: DeclarationId(1872), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67986,11 +56509,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2085, 2099), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1872), -======= - id: DeclarationId(1871), ->>>>>>> origin/main + id: DeclarationId(1873), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68004,11 +56523,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2385, 2399), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1873), -======= - id: DeclarationId(1872), ->>>>>>> origin/main + id: DeclarationId(1874), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68022,31 +56537,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation_model.dag", 2404, 2418), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1874), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/computation_model.dag", 2818, 2830), - }); - declarations.push(Declaration { id: DeclarationId(1875), -======= - id: DeclarationId(1873), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -68212,7 +56703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 1125, 1148), }); declarations.push(Declaration { - id: DeclarationId(1884), + id: DeclarationId(1886), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68231,11 +56722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5348, 5384), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1886), -======= - id: DeclarationId(1885), ->>>>>>> origin/main + id: DeclarationId(1887), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68254,11 +56741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5389, 5430), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1887), -======= - id: DeclarationId(1886), ->>>>>>> origin/main + id: DeclarationId(1888), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -68278,11 +56761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 5889, 5905), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1888), -======= - id: DeclarationId(1887), ->>>>>>> origin/main + id: DeclarationId(1889), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68301,11 +56780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9017, 9058), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1889), -======= - id: DeclarationId(1888), ->>>>>>> origin/main + id: DeclarationId(1890), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68319,11 +56794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9355, 9367), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1890), -======= - id: DeclarationId(1889), ->>>>>>> origin/main + id: DeclarationId(1891), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -68343,11 +56814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9637, 9649), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1891), -======= - id: DeclarationId(1890), ->>>>>>> origin/main + id: DeclarationId(1892), name: None, connective: TypeConnective::Conj { children: vec![ @@ -68357,11 +56824,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "sites".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1890), -======= - ty: DeclarationId(1889), ->>>>>>> origin/main + ty: DeclarationId(1891), }, ], }, @@ -68376,11 +56839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9594, 9651), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1892), -======= - id: DeclarationId(1891), ->>>>>>> origin/main + id: DeclarationId(1893), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68399,11 +56858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 9961, 9995), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1893), -======= - id: DeclarationId(1892), ->>>>>>> origin/main + id: DeclarationId(1894), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68422,11 +56877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10398, 10449), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1894), -======= - id: DeclarationId(1893), ->>>>>>> origin/main + id: DeclarationId(1895), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68440,11 +56891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 10792, 10810), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1895), -======= - id: DeclarationId(1894), ->>>>>>> origin/main + id: DeclarationId(1896), name: None, connective: TypeConnective::Conj { children: vec![ @@ -68473,11 +56920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/diagnostics.dag", 11160, 11258), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1896), -======= - id: DeclarationId(1895), ->>>>>>> origin/main + id: DeclarationId(1897), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -68497,10 +56940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4196, 4216), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1897), -======= - id: DeclarationId(1896), + id: DeclarationId(1898), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68526,7 +56966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4226, 4250), }); declarations.push(Declaration { - id: DeclarationId(1897), + id: DeclarationId(1899), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68552,8 +56992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4261, 4285), }); declarations.push(Declaration { - id: DeclarationId(1898), ->>>>>>> origin/main + id: DeclarationId(1900), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68576,62 +57015,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/dimensions.dag", 4226, 4250), - }); - declarations.push(Declaration { - id: DeclarationId(1899), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(875), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(876), - value: DeclarationId(886), - }, - TemplateArgument { - parameter: DeclarationId(877), - value: DeclarationId(887), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/dimensions.dag", 4261, 4285), - }); - declarations.push(Declaration { - id: DeclarationId(1899), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(875), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(876), - value: DeclarationId(886), - }, - TemplateArgument { - parameter: DeclarationId(877), - value: DeclarationId(887), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, span: SourceSpan::new("src/v3/std/dimensions.dag", 4291, 4315), }); declarations.push(Declaration { - id: DeclarationId(1900), + id: DeclarationId(1901), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -68651,63 +57038,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4392, 4412), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1901), -======= - id: DeclarationId(1900), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(876), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(877), - value: DeclarationId(890), - }, - TemplateArgument { - parameter: DeclarationId(878), - value: DeclarationId(891), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/dimensions.dag", 4422, 4446), - }); - declarations.push(Declaration { - id: DeclarationId(1901), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(876), - arguments: vec![ - TemplateArgument { - parameter: DeclarationId(877), - value: DeclarationId(890), - }, - TemplateArgument { - parameter: DeclarationId(878), - value: DeclarationId(891), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/dimensions.dag", 4457, 4481), - }); - declarations.push(Declaration { id: DeclarationId(1902), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68736,16 +57067,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(1903), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(875), + template: DeclarationId(876), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(876), - value: DeclarationId(889), - }, TemplateArgument { parameter: DeclarationId(877), value: DeclarationId(890), }, + TemplateArgument { + parameter: DeclarationId(878), + value: DeclarationId(891), + }, ], }, type_params: vec![], @@ -68759,19 +57090,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4457, 4481), }); declarations.push(Declaration { - id: DeclarationId(1903), + id: DeclarationId(1904), name: None, connective: TypeConnective::Instantiation { - template: DeclarationId(875), + template: DeclarationId(876), arguments: vec![ - TemplateArgument { - parameter: DeclarationId(876), - value: DeclarationId(889), - }, TemplateArgument { parameter: DeclarationId(877), value: DeclarationId(890), }, + TemplateArgument { + parameter: DeclarationId(878), + value: DeclarationId(891), + }, ], }, type_params: vec![], @@ -68785,7 +57116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4487, 4511), }); declarations.push(Declaration { - id: DeclarationId(1904), + id: DeclarationId(1905), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -68805,11 +57136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4595, 4615), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1905), -======= - id: DeclarationId(1904), ->>>>>>> origin/main + id: DeclarationId(1906), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68835,11 +57162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4626, 4650), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1906), -======= - id: DeclarationId(1905), ->>>>>>> origin/main + id: DeclarationId(1907), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68865,11 +57188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4675, 4699), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1907), -======= - id: DeclarationId(1906), ->>>>>>> origin/main + id: DeclarationId(1908), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -68889,11 +57208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4790, 4810), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1908), -======= - id: DeclarationId(1907), ->>>>>>> origin/main + id: DeclarationId(1909), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68919,11 +57234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4821, 4845), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1909), -======= - id: DeclarationId(1908), ->>>>>>> origin/main + id: DeclarationId(1910), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -68949,11 +57260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4870, 4894), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1910), -======= - id: DeclarationId(1909), ->>>>>>> origin/main + id: DeclarationId(1911), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68972,11 +57279,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1626, 1643), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1911), -======= - id: DeclarationId(1910), ->>>>>>> origin/main + id: DeclarationId(1912), name: None, connective: TypeConnective::Conj { children: vec![ @@ -69001,11 +57304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1648, 1689), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1912), -======= - id: DeclarationId(1911), ->>>>>>> origin/main + id: DeclarationId(1913), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69019,11 +57318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1871, 1883), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1913), -======= - id: DeclarationId(1912), ->>>>>>> origin/main + id: DeclarationId(1914), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69042,11 +57337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 1888, 1924), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1914), -======= - id: DeclarationId(1913), ->>>>>>> origin/main + id: DeclarationId(1915), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -69066,21 +57357,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2406, 2422), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1915), -======= - id: DeclarationId(1914), ->>>>>>> origin/main + id: DeclarationId(1916), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1914), -======= - value: DeclarationId(1913), ->>>>>>> origin/main + value: DeclarationId(1915), }], }, type_params: vec![], @@ -69094,11 +57377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2401, 2423), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1916), -======= - id: DeclarationId(1915), ->>>>>>> origin/main + id: DeclarationId(1917), name: None, connective: TypeConnective::Conj { children: vec![ @@ -69112,11 +57391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "witnesses".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1915), -======= - ty: DeclarationId(1914), ->>>>>>> origin/main + ty: DeclarationId(1916), }, ], }, @@ -69131,11 +57406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2317, 2429), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1917), -======= - id: DeclarationId(1916), ->>>>>>> origin/main + id: DeclarationId(1918), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -69155,11 +57426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2497, 2513), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1918), -======= - id: DeclarationId(1917), ->>>>>>> origin/main + id: DeclarationId(1919), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -69179,21 +57446,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2536, 2552), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1919), -======= - id: DeclarationId(1918), ->>>>>>> origin/main + id: DeclarationId(1920), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1918), -======= - value: DeclarationId(1917), ->>>>>>> origin/main + value: DeclarationId(1919), }], }, type_params: vec![], @@ -69207,11 +57466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2531, 2553), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1920), -======= - id: DeclarationId(1919), ->>>>>>> origin/main + id: DeclarationId(1921), name: None, connective: TypeConnective::Conj { children: vec![ @@ -69221,19 +57476,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "violations".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1917), - }, - Field { - label: "witnesses".to_string(), - ty: DeclarationId(1919), -======= - ty: DeclarationId(1916), + ty: DeclarationId(1918), }, Field { label: "witnesses".to_string(), - ty: DeclarationId(1918), ->>>>>>> origin/main + ty: DeclarationId(1920), }, ], }, @@ -69248,11 +57495,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 2434, 2559), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1921), -======= - id: DeclarationId(1920), ->>>>>>> origin/main + id: DeclarationId(1922), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -69272,19 +57515,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3216, 3232), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1922), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744), DeclarationId(743)], - output: DeclarationId(1921), -======= - id: DeclarationId(1921), + id: DeclarationId(1923), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745), DeclarationId(744)], - output: DeclarationId(1920), ->>>>>>> origin/main + output: DeclarationId(1922), body: ArrowBody::NoBody, }, type_params: vec![], @@ -69298,11 +57533,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3195, 3232), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1923), -======= - id: DeclarationId(1922), ->>>>>>> origin/main + id: DeclarationId(1924), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(875), DeclarationId(875)], @@ -69320,11 +57551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3244, 3275), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1924), -======= - id: DeclarationId(1923), ->>>>>>> origin/main + id: DeclarationId(1925), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(875)], @@ -69342,11 +57569,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 3316, 3359), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1925), -======= - id: DeclarationId(1924), ->>>>>>> origin/main + id: DeclarationId(1926), name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), @@ -69366,11 +57589,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/dimensions.dag", 4002, 4052), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1926), -======= - id: DeclarationId(1925), ->>>>>>> origin/main + id: DeclarationId(1927), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -69390,11 +57609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 855, 873), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1927), -======= - id: DeclarationId(1926), ->>>>>>> origin/main + id: DeclarationId(1928), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69408,11 +57623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4188, 4204), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1928), -======= - id: DeclarationId(1927), ->>>>>>> origin/main + id: DeclarationId(1929), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69431,11 +57642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4209, 4237), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1929), -======= - id: DeclarationId(1928), ->>>>>>> origin/main + id: DeclarationId(1930), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69454,11 +57661,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4727, 4746), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1930), -======= - id: DeclarationId(1929), ->>>>>>> origin/main + id: DeclarationId(1931), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69477,11 +57680,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 4751, 4773), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1931), -======= - id: DeclarationId(1930), ->>>>>>> origin/main + id: DeclarationId(1932), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -69501,11 +57700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 5142, 5165), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1932), -======= - id: DeclarationId(1931), ->>>>>>> origin/main + id: DeclarationId(1933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69519,11 +57714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6162, 6170), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1933), -======= - id: DeclarationId(1932), ->>>>>>> origin/main + id: DeclarationId(1934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69537,11 +57728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6175, 6183), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1934), -======= - id: DeclarationId(1933), ->>>>>>> origin/main + id: DeclarationId(1935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69555,11 +57742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6624, 6629), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1935), -======= - id: DeclarationId(1934), ->>>>>>> origin/main + id: DeclarationId(1936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69573,11 +57756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6634, 6642), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1936), -======= - id: DeclarationId(1935), ->>>>>>> origin/main + id: DeclarationId(1937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69591,11 +57770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6978, 6991), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1937), -======= - id: DeclarationId(1936), ->>>>>>> origin/main + id: DeclarationId(1938), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69609,11 +57784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 6996, 7002), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1938), -======= - id: DeclarationId(1937), ->>>>>>> origin/main + id: DeclarationId(1939), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69627,11 +57798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7260, 7268), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1939), -======= - id: DeclarationId(1938), ->>>>>>> origin/main + id: DeclarationId(1940), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69645,11 +57812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7273, 7278), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1940), -======= - id: DeclarationId(1939), ->>>>>>> origin/main + id: DeclarationId(1941), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69663,11 +57826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7283, 7296), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1941), -======= - id: DeclarationId(1940), ->>>>>>> origin/main + id: DeclarationId(1942), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69681,11 +57840,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 7633, 7651), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1942), -======= - id: DeclarationId(1941), ->>>>>>> origin/main + id: DeclarationId(1943), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69699,11 +57854,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8203, 8212), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1943), -======= - id: DeclarationId(1942), ->>>>>>> origin/main + id: DeclarationId(1944), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69717,11 +57868,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8217, 8230), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1944), -======= - id: DeclarationId(1943), ->>>>>>> origin/main + id: DeclarationId(1945), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69735,11 +57882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8235, 8243), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1945), -======= - id: DeclarationId(1944), ->>>>>>> origin/main + id: DeclarationId(1946), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69753,11 +57896,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8248, 8258), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1946), -======= - id: DeclarationId(1945), ->>>>>>> origin/main + id: DeclarationId(1947), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69771,11 +57910,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8263, 8273), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1947), -======= - id: DeclarationId(1946), ->>>>>>> origin/main + id: DeclarationId(1948), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69789,11 +57924,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8278, 8289), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1948), -======= - id: DeclarationId(1947), ->>>>>>> origin/main + id: DeclarationId(1949), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69807,11 +57938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8294, 8302), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1949), -======= - id: DeclarationId(1948), ->>>>>>> origin/main + id: DeclarationId(1950), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69825,11 +57952,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8307, 8314), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1950), -======= - id: DeclarationId(1949), ->>>>>>> origin/main + id: DeclarationId(1951), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69843,11 +57966,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8319, 8329), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1951), -======= - id: DeclarationId(1950), ->>>>>>> origin/main + id: DeclarationId(1952), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69861,11 +57980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 8334, 8346), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1952), -======= - id: DeclarationId(1951), ->>>>>>> origin/main + id: DeclarationId(1953), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69879,11 +57994,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11039, 11065), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1953), -======= - id: DeclarationId(1952), ->>>>>>> origin/main + id: DeclarationId(1954), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69897,11 +58008,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 11070, 11080), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1954), -======= - id: DeclarationId(1953), ->>>>>>> origin/main + id: DeclarationId(1955), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69915,11 +58022,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14808, 14814), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1955), -======= - id: DeclarationId(1954), ->>>>>>> origin/main + id: DeclarationId(1956), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69933,11 +58036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 14819, 14830), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1956), -======= - id: DeclarationId(1955), ->>>>>>> origin/main + id: DeclarationId(1957), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69951,11 +58050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15150, 15161), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1957), -======= - id: DeclarationId(1956), ->>>>>>> origin/main + id: DeclarationId(1958), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69969,11 +58064,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 15166, 15177), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1958), -======= - id: DeclarationId(1957), ->>>>>>> origin/main + id: DeclarationId(1959), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69987,11 +58078,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17110, 17121), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1959), -======= - id: DeclarationId(1958), ->>>>>>> origin/main + id: DeclarationId(1960), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70005,11 +58092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 17126, 17134), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1960), -======= - id: DeclarationId(1959), ->>>>>>> origin/main + id: DeclarationId(1961), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70028,11 +58111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 18297, 18332), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1961), -======= - id: DeclarationId(1960), ->>>>>>> origin/main + id: DeclarationId(1962), name: None, connective: TypeConnective::Conj { children: vec![ @@ -70057,11 +58136,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/emit_model.dag", 18337, 18425), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1962), -======= - id: DeclarationId(1961), ->>>>>>> origin/main + id: DeclarationId(1963), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -70081,11 +58156,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/go_method_template_contracts.dag", 2458, 2486), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1963), -======= - id: DeclarationId(1962), ->>>>>>> origin/main + id: DeclarationId(1964), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(837), @@ -70102,11 +58173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20505, 20517), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1964), -======= - id: DeclarationId(1963), ->>>>>>> origin/main + id: DeclarationId(1965), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(840), @@ -70123,11 +58190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21890, 21905), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1965), -======= - id: DeclarationId(1964), ->>>>>>> origin/main + id: DeclarationId(1966), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -70147,28 +58210,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27797, 27812), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1966), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(81), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 31950, 31954), - }); - declarations.push(Declaration { id: DeclarationId(1967), -======= - id: DeclarationId(1965), ->>>>>>> origin/main name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -70340,7 +58382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 5794, 5811), }); declarations.push(Declaration { - id: DeclarationId(1976), + id: DeclarationId(1978), name: None, connective: TypeConnective::Conj { children: vec![ @@ -70365,11 +58407,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9904, 9966), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1978), -======= - id: DeclarationId(1977), ->>>>>>> origin/main + id: DeclarationId(1979), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70388,11 +58426,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 9971, 10013), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1979), -======= - id: DeclarationId(1978), ->>>>>>> origin/main + id: DeclarationId(1980), name: None, connective: TypeConnective::Conj { children: vec![ @@ -70417,11 +58451,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10018, 10075), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1980), -======= - id: DeclarationId(1979), ->>>>>>> origin/main + id: DeclarationId(1981), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70435,11 +58465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10080, 10094), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1981), -======= - id: DeclarationId(1980), ->>>>>>> origin/main + id: DeclarationId(1982), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70453,11 +58479,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 10099, 10114), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1982), -======= - id: DeclarationId(1981), ->>>>>>> origin/main + id: DeclarationId(1983), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70471,20 +58493,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24082, 24096), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1983), -======= - id: DeclarationId(1982), ->>>>>>> origin/main + id: DeclarationId(1984), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }], }, type_params: vec![], @@ -70498,29 +58512,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24101, 24148), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1984), -======= - id: DeclarationId(1983), ->>>>>>> origin/main + id: DeclarationId(1985), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "numerator".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), - }, - Field { - label: "root".to_string(), - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), + ty: DeclarationId(1042), }, Field { label: "root".to_string(), - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }, ], }, @@ -70535,29 +58537,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24153, 24230), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1985), -======= - id: DeclarationId(1984), ->>>>>>> origin/main + id: DeclarationId(1986), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "base".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1042), - }, - Field { - label: "argument".to_string(), - ty: DeclarationId(1041), -======= - ty: DeclarationId(1041), + ty: DeclarationId(1043), }, Field { label: "argument".to_string(), - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }, ], }, @@ -70572,11 +58562,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24235, 24309), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1986), -======= - id: DeclarationId(1985), ->>>>>>> origin/main + id: DeclarationId(1987), name: None, connective: TypeConnective::Conj { children: vec![ @@ -70601,11 +58587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 24929, 24985), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1987), -======= - id: DeclarationId(1986), ->>>>>>> origin/main + id: DeclarationId(1988), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70624,11 +58606,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 25001, 25026), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1988), -======= - id: DeclarationId(1987), ->>>>>>> origin/main + id: DeclarationId(1989), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70642,11 +58620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26675, 26688), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1989), -======= - id: DeclarationId(1988), ->>>>>>> origin/main + id: DeclarationId(1990), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70665,109 +58639,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26732, 26764), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1990), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(955), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843), - }); - declarations.push(Declaration { id: DeclarationId(1991), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "factors".to_string(), - ty: DeclarationId(1990), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845), - }); - declarations.push(Declaration { - id: DeclarationId(1992), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(955), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923), - }); - declarations.push(Declaration { - id: DeclarationId(1993), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(1992), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924), - }); - declarations.push(Declaration { - id: DeclarationId(1994), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "terms".to_string(), - ty: DeclarationId(1993), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926), - }); - declarations.push(Declaration { - id: DeclarationId(1995), -======= - id: DeclarationId(1989), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -70787,15 +58659,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26827, 26843), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1996), -======= - id: DeclarationId(1990), + id: DeclarationId(1992), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "factors".to_string(), - ty: DeclarationId(1989), + ty: DeclarationId(1991), }], }, type_params: vec![], @@ -70809,7 +58678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26803, 26845), }); declarations.push(Declaration { - id: DeclarationId(1991), + id: DeclarationId(1993), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -70829,13 +58698,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26907, 26923), }); declarations.push(Declaration { - id: DeclarationId(1992), + id: DeclarationId(1994), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1991), + value: DeclarationId(1993), }], }, type_params: vec![], @@ -70849,16 +58718,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26902, 26924), }); declarations.push(Declaration { - id: DeclarationId(1993), ->>>>>>> origin/main + id: DeclarationId(1995), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1995), -======= - ty: DeclarationId(1992), + ty: DeclarationId(1994), }], }, type_params: vec![], @@ -70872,7 +58737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 26874, 26926), }); declarations.push(Declaration { - id: DeclarationId(1994), + id: DeclarationId(1996), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -70892,13 +58757,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27224, 27239), }); declarations.push(Declaration { - id: DeclarationId(1995), + id: DeclarationId(1997), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), - ty: DeclarationId(1994), ->>>>>>> origin/main + ty: DeclarationId(1996), }], }, type_params: vec![], @@ -70912,11 +58776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27206, 27241), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1997), -======= - id: DeclarationId(1996), ->>>>>>> origin/main + id: DeclarationId(1998), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70930,11 +58790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27324, 27336), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1998), -======= - id: DeclarationId(1997), ->>>>>>> origin/main + id: DeclarationId(1999), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70948,21 +58804,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 27406, 27416), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1999), -======= - id: DeclarationId(1998), ->>>>>>> origin/main + id: DeclarationId(2000), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1086), -======= - value: DeclarationId(1085), ->>>>>>> origin/main + value: DeclarationId(1087), }], }, type_params: vec![], @@ -70976,21 +58824,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1234, 1254), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2000), -======= - id: DeclarationId(1999), ->>>>>>> origin/main + id: DeclarationId(2001), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1086), -======= - value: DeclarationId(1085), ->>>>>>> origin/main + value: DeclarationId(1087), }], }, type_params: vec![], @@ -71004,11 +58844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/integer_diagnostic_order.dag", 1414, 1434), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2001), -======= - id: DeclarationId(2000), ->>>>>>> origin/main + id: DeclarationId(2002), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -71028,19 +58864,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4180, 4190), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2002), - name: None, - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744), DeclarationId(743)], - output: DeclarationId(2001), -======= - id: DeclarationId(2001), + id: DeclarationId(2003), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745), DeclarationId(744)], - output: DeclarationId(2000), ->>>>>>> origin/main + output: DeclarationId(2002), body: ArrowBody::NoBody, }, type_params: vec![], @@ -71054,11 +58882,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4159, 4190), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2003), -======= - id: DeclarationId(2002), ->>>>>>> origin/main + id: DeclarationId(2004), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -71078,11 +58902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4205, 4214), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2004), -======= - id: DeclarationId(2003), ->>>>>>> origin/main + id: DeclarationId(2005), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(996), DeclarationId(996)], @@ -71100,11 +58920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4225, 4238), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2005), -======= - id: DeclarationId(2004), ->>>>>>> origin/main + id: DeclarationId(2006), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(996), DeclarationId(735)], @@ -71122,11 +58938,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4250, 4271), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2006), -======= - id: DeclarationId(2005), ->>>>>>> origin/main + id: DeclarationId(2007), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745), DeclarationId(996)], @@ -71144,11 +58956,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lens.dag", 4284, 4316), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2007), -======= - id: DeclarationId(2006), ->>>>>>> origin/main + id: DeclarationId(2008), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -71168,11 +58976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4577, 4588), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2008), -======= - id: DeclarationId(2007), ->>>>>>> origin/main + id: DeclarationId(2009), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -71192,11 +58996,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4630, 4641), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2009), -======= - id: DeclarationId(2008), ->>>>>>> origin/main + id: DeclarationId(2010), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71210,11 +59010,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4532, 4536), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2010), -======= - id: DeclarationId(2009), ->>>>>>> origin/main + id: DeclarationId(2011), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71233,11 +59029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/lookup.dag", 4541, 4551), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2011), -======= - id: DeclarationId(2010), ->>>>>>> origin/main + id: DeclarationId(2012), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71257,11 +59049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1179, 1196), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2012), -======= - id: DeclarationId(2011), ->>>>>>> origin/main + id: DeclarationId(2013), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1014), @@ -71278,11 +59066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2013), -======= - id: DeclarationId(2012), ->>>>>>> origin/main + id: DeclarationId(2014), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71302,20 +59086,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1747, 1764), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2014), -======= - id: DeclarationId(2013), ->>>>>>> origin/main + id: DeclarationId(2015), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2013), -======= - ty: DeclarationId(2012), ->>>>>>> origin/main + ty: DeclarationId(2014), }], }, type_params: vec![], @@ -71329,11 +59105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1736, 1765), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2015), -======= - id: DeclarationId(2014), ->>>>>>> origin/main + id: DeclarationId(2016), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71353,20 +59125,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1777, 1795), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2016), -======= - id: DeclarationId(2015), ->>>>>>> origin/main + id: DeclarationId(2017), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2015), -======= - ty: DeclarationId(2014), ->>>>>>> origin/main + ty: DeclarationId(2016), }], }, type_params: vec![], @@ -71380,11 +59144,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1770, 1796), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2017), -======= - id: DeclarationId(2016), ->>>>>>> origin/main + id: DeclarationId(2018), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71409,11 +59169,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2073, 2113), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2018), -======= - id: DeclarationId(2017), ->>>>>>> origin/main + id: DeclarationId(2019), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71433,11 +59189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2165, 2182), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2019), -======= - id: DeclarationId(2018), ->>>>>>> origin/main + id: DeclarationId(2020), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71447,11 +59199,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2018), -======= - ty: DeclarationId(2017), ->>>>>>> origin/main + ty: DeclarationId(2019), }, Field { label: "span".to_string(), @@ -71470,11 +59218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2118, 2211), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2020), -======= - id: DeclarationId(2019), ->>>>>>> origin/main + id: DeclarationId(2021), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71499,11 +59243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2216, 2280), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2021), -======= - id: DeclarationId(2020), ->>>>>>> origin/main + id: DeclarationId(2022), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71523,21 +59263,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2307, 2324), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2022), -======= - id: DeclarationId(2021), ->>>>>>> origin/main + id: DeclarationId(2023), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2021), -======= - ty: DeclarationId(2020), ->>>>>>> origin/main + ty: DeclarationId(2022), }, Field { label: "output".to_string(), @@ -71560,11 +59292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 2285, 2379), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2023), -======= - id: DeclarationId(2022), ->>>>>>> origin/main + id: DeclarationId(2024), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71589,11 +59317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3749, 3795), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2024), -======= - id: DeclarationId(2023), ->>>>>>> origin/main + id: DeclarationId(2025), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71622,11 +59346,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3800, 3883), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2025), -======= - id: DeclarationId(2024), ->>>>>>> origin/main + id: DeclarationId(2026), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71646,11 +59366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3937, 3962), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2026), -======= - id: DeclarationId(2025), ->>>>>>> origin/main + id: DeclarationId(2027), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71660,11 +59376,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2025), -======= - ty: DeclarationId(2024), ->>>>>>> origin/main + ty: DeclarationId(2026), }, Field { label: "span".to_string(), @@ -71683,11 +59395,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 3888, 3991), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2027), -======= - id: DeclarationId(2026), ->>>>>>> origin/main + id: DeclarationId(2028), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71706,11 +59414,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4578, 4586), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2028), -======= - id: DeclarationId(2027), ->>>>>>> origin/main + id: DeclarationId(2029), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71729,11 +59433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4591, 4601), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2029), -======= - id: DeclarationId(2028), ->>>>>>> origin/main + id: DeclarationId(2030), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71752,11 +59452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4606, 4620), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2030), -======= - id: DeclarationId(2029), ->>>>>>> origin/main + id: DeclarationId(2031), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71781,11 +59477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4734, 4785), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2031), -======= - id: DeclarationId(2030), ->>>>>>> origin/main + id: DeclarationId(2032), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71810,11 +59502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4790, 4828), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2032), -======= - id: DeclarationId(2031), ->>>>>>> origin/main + id: DeclarationId(2033), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71834,11 +59522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4856, 4868), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2033), -======= - id: DeclarationId(2032), ->>>>>>> origin/main + id: DeclarationId(2034), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71858,29 +59542,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4890, 4906), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2034), -======= - id: DeclarationId(2033), ->>>>>>> origin/main + id: DeclarationId(2035), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "segments".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2032), - }, - Field { - label: "segment_spans".to_string(), ty: DeclarationId(2033), -======= - ty: DeclarationId(2031), }, Field { label: "segment_spans".to_string(), - ty: DeclarationId(2032), ->>>>>>> origin/main + ty: DeclarationId(2034), }, Field { label: "span".to_string(), @@ -71899,11 +59571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4833, 4935), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2035), -======= - id: DeclarationId(2034), ->>>>>>> origin/main + id: DeclarationId(2036), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71923,11 +59591,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4980, 4997), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2036), -======= - id: DeclarationId(2035), ->>>>>>> origin/main + id: DeclarationId(2037), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71937,11 +59601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2035), -======= - ty: DeclarationId(2034), ->>>>>>> origin/main + ty: DeclarationId(2036), }, Field { label: "span".to_string(), @@ -71960,11 +59620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 4940, 5026), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2037), -======= - id: DeclarationId(2036), ->>>>>>> origin/main + id: DeclarationId(2038), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71984,11 +59640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5082, 5106), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2038), -======= - id: DeclarationId(2037), ->>>>>>> origin/main + id: DeclarationId(2039), name: None, connective: TypeConnective::Conj { children: vec![ @@ -71998,11 +59650,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2037), -======= - ty: DeclarationId(2036), ->>>>>>> origin/main + ty: DeclarationId(2038), }, Field { label: "span".to_string(), @@ -72021,11 +59669,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5031, 5135), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2039), -======= - id: DeclarationId(2038), ->>>>>>> origin/main + id: DeclarationId(2040), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72045,11 +59689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5186, 5203), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2040), -======= - id: DeclarationId(2039), ->>>>>>> origin/main + id: DeclarationId(2041), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72059,11 +59699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2039), -======= - ty: DeclarationId(2038), ->>>>>>> origin/main + ty: DeclarationId(2040), }, Field { label: "span".to_string(), @@ -72082,11 +59718,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5140, 5232), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2041), -======= - id: DeclarationId(2040), ->>>>>>> origin/main + id: DeclarationId(2042), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72106,21 +59738,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5260, 5272), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2042), -======= - id: DeclarationId(2041), ->>>>>>> origin/main + id: DeclarationId(2043), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2041), -======= - ty: DeclarationId(2040), ->>>>>>> origin/main + ty: DeclarationId(2042), }, Field { label: "body".to_string(), @@ -72143,11 +59767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5237, 5325), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2043), -======= - id: DeclarationId(2042), ->>>>>>> origin/main + id: DeclarationId(2044), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72180,11 +59800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5330, 5449), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2044), -======= - id: DeclarationId(2043), ->>>>>>> origin/main + id: DeclarationId(2045), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72204,11 +59820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5503, 5524), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2045), -======= - id: DeclarationId(2044), ->>>>>>> origin/main + id: DeclarationId(2046), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72218,11 +59830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "arms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2044), -======= - ty: DeclarationId(2043), ->>>>>>> origin/main + ty: DeclarationId(2045), }, Field { label: "span".to_string(), @@ -72241,11 +59849,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5454, 5553), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2046), -======= - id: DeclarationId(2045), ->>>>>>> origin/main + id: DeclarationId(2047), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72265,21 +59869,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5581, 5605), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2047), -======= - id: DeclarationId(2046), ->>>>>>> origin/main + id: DeclarationId(2048), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2046), -======= - ty: DeclarationId(2045), ->>>>>>> origin/main + ty: DeclarationId(2047), }, Field { label: "span".to_string(), @@ -72298,11 +59894,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5558, 5634), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2048), -======= - id: DeclarationId(2047), ->>>>>>> origin/main + id: DeclarationId(2049), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72322,21 +59914,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5662, 5679), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2049), -======= - id: DeclarationId(2048), ->>>>>>> origin/main + id: DeclarationId(2050), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "elements".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2048), -======= - ty: DeclarationId(2047), ->>>>>>> origin/main + ty: DeclarationId(2049), }, Field { label: "span".to_string(), @@ -72355,11 +59939,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 5639, 5708), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2050), -======= - id: DeclarationId(2049), ->>>>>>> origin/main + id: DeclarationId(2051), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72379,21 +59959,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 7802, 7823), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2051), -======= - id: DeclarationId(2050), ->>>>>>> origin/main + id: DeclarationId(2052), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "entries".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2050), -======= - ty: DeclarationId(2049), ->>>>>>> origin/main + ty: DeclarationId(2051), }, Field { label: "span".to_string(), @@ -72412,11 +59984,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 7781, 7852), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2052), -======= - id: DeclarationId(2051), ->>>>>>> origin/main + id: DeclarationId(2053), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1007), @@ -72433,11 +60001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8783, 8795), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2053), -======= - id: DeclarationId(2052), ->>>>>>> origin/main + id: DeclarationId(2054), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72447,11 +60011,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_ann".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2052), -======= - ty: DeclarationId(2051), ->>>>>>> origin/main + ty: DeclarationId(2053), }, Field { label: "expr".to_string(), @@ -72470,11 +60030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8742, 8825), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2054), -======= - id: DeclarationId(2053), ->>>>>>> origin/main + id: DeclarationId(2055), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72494,11 +60050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8873, 8885), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2055), -======= - id: DeclarationId(2054), ->>>>>>> origin/main + id: DeclarationId(2056), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72518,11 +60070,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8900, 8918), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2056), -======= - id: DeclarationId(2055), ->>>>>>> origin/main + id: DeclarationId(2057), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72532,19 +60080,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2054), - }, - Field { - label: "params".to_string(), ty: DeclarationId(2055), -======= - ty: DeclarationId(2053), ->>>>>>> origin/main }, Field { label: "params".to_string(), - ty: DeclarationId(2054), + ty: DeclarationId(2056), }, Field { label: "return_type".to_string(), @@ -72571,11 +60111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 8830, 9002), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2057), -======= - id: DeclarationId(2056), ->>>>>>> origin/main + id: DeclarationId(2058), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72595,11 +60131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9062, 9074), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2058), -======= - id: DeclarationId(2057), ->>>>>>> origin/main + id: DeclarationId(2059), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72619,11 +60151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9089, 9107), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2059), -======= - id: DeclarationId(2058), ->>>>>>> origin/main + id: DeclarationId(2060), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72633,19 +60161,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2057), - }, - Field { - label: "params".to_string(), ty: DeclarationId(2058), -======= - ty: DeclarationId(2056), ->>>>>>> origin/main }, Field { label: "params".to_string(), - ty: DeclarationId(2057), + ty: DeclarationId(2059), }, Field { label: "return_type".to_string(), @@ -72672,11 +60192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9007, 9195), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2060), -======= - id: DeclarationId(2059), ->>>>>>> origin/main + id: DeclarationId(2061), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1014), @@ -72693,11 +60209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9260, 9272), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2061), -======= - id: DeclarationId(2060), ->>>>>>> origin/main + id: DeclarationId(2062), name: None, connective: TypeConnective::Conj { children: vec![ @@ -72711,11 +60223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "body".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2060), -======= - ty: DeclarationId(2059), ->>>>>>> origin/main + ty: DeclarationId(2061), }, Field { label: "body_span".to_string(), @@ -72738,11 +60246,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9200, 9329), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2062), -======= - id: DeclarationId(2061), ->>>>>>> origin/main + id: DeclarationId(2063), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72762,21 +60266,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9349, 9361), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2063), -======= - id: DeclarationId(2062), ->>>>>>> origin/main + id: DeclarationId(2064), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2062), -======= - ty: DeclarationId(2061), ->>>>>>> origin/main + ty: DeclarationId(2063), }, Field { label: "span".to_string(), @@ -72795,31 +60291,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9334, 9381), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2064), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419), - }); - declarations.push(Declaration { id: DeclarationId(2065), -======= - id: DeclarationId(2063), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72839,10 +60311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9407, 9419), }); declarations.push(Declaration { -<<<<<<< HEAD id: DeclarationId(2066), -======= - id: DeclarationId(2064), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -72861,73 +60330,18 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { nominal_opacity: None, span: SourceSpan::new("src/v3/std/parse_surface.dag", 9433, 9445), }); - declarations.push(Declaration { - id: DeclarationId(2065), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "path".to_string(), - ty: DeclarationId(2063), - }, - Field { - label: "names".to_string(), - ty: DeclarationId(2064), - }, - Field { - label: "span".to_string(), - ty: DeclarationId(132), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9386, 9474), - }); - declarations.push(Declaration { - id: DeclarationId(2066), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/parse_surface.dag", 9528, 9540), - }); declarations.push(Declaration { id: DeclarationId(2067), ->>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "path".to_string(), - ty: DeclarationId(2064), + ty: DeclarationId(2065), }, Field { -<<<<<<< HEAD label: "names".to_string(), - ty: DeclarationId(2065), -======= - label: "type_params".to_string(), ty: DeclarationId(2066), ->>>>>>> origin/main }, Field { label: "span".to_string(), @@ -72976,7 +60390,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), - ty: DeclarationId(2067), + ty: DeclarationId(2068), }, Field { label: "span".to_string(), @@ -72995,7 +60409,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9479, 9569), }); declarations.push(Declaration { - id: DeclarationId(2069), + id: DeclarationId(2070), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73015,7 +60429,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9625, 9637), }); declarations.push(Declaration { - id: DeclarationId(2070), + id: DeclarationId(2071), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73035,11 +60449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9652, 9670), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2071), -======= - id: DeclarationId(2070), ->>>>>>> origin/main + id: DeclarationId(2072), name: None, connective: TypeConnective::Conj { children: vec![ @@ -73049,19 +60459,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2069), - }, - Field { - label: "fields".to_string(), ty: DeclarationId(2070), -======= - ty: DeclarationId(2068), }, Field { label: "fields".to_string(), - ty: DeclarationId(2069), ->>>>>>> origin/main + ty: DeclarationId(2071), }, Field { label: "span".to_string(), @@ -73080,11 +60482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9574, 9699), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2072), -======= - id: DeclarationId(2071), ->>>>>>> origin/main + id: DeclarationId(2073), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73104,11 +60502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9752, 9764), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2073), -======= - id: DeclarationId(2072), ->>>>>>> origin/main + id: DeclarationId(2074), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73128,11 +60522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9781, 9801), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2074), -======= - id: DeclarationId(2073), ->>>>>>> origin/main + id: DeclarationId(2075), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1007), @@ -73149,11 +60539,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9818, 9830), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2075), -======= - id: DeclarationId(2074), ->>>>>>> origin/main + id: DeclarationId(2076), name: None, connective: TypeConnective::Conj { children: vec![ @@ -73163,27 +60549,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2072), - }, - Field { - label: "variants".to_string(), ty: DeclarationId(2073), }, - Field { - label: "inhabits".to_string(), - ty: DeclarationId(2074), -======= - ty: DeclarationId(2071), - }, Field { label: "variants".to_string(), - ty: DeclarationId(2072), ->>>>>>> origin/main + ty: DeclarationId(2074), }, Field { label: "inhabits".to_string(), - ty: DeclarationId(2073), + ty: DeclarationId(2075), }, Field { label: "span".to_string(), @@ -73202,11 +60576,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9704, 9859), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2076), -======= - id: DeclarationId(2075), ->>>>>>> origin/main + id: DeclarationId(2077), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73226,11 +60596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9914, 9926), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2077), -======= - id: DeclarationId(2076), ->>>>>>> origin/main + id: DeclarationId(2078), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1014), @@ -73247,11 +60613,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9998, 10010), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2078), -======= - id: DeclarationId(2077), ->>>>>>> origin/main + id: DeclarationId(2079), name: None, connective: TypeConnective::Conj { children: vec![ @@ -73261,11 +60623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "type_params".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2076), -======= - ty: DeclarationId(2075), ->>>>>>> origin/main + ty: DeclarationId(2077), }, Field { label: "nominal_opaque".to_string(), @@ -73277,11 +60635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "refinement".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2077), -======= - ty: DeclarationId(2076), ->>>>>>> origin/main + ty: DeclarationId(2078), }, Field { label: "span".to_string(), @@ -73300,11 +60654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9864, 10039), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2079), -======= - id: DeclarationId(2078), ->>>>>>> origin/main + id: DeclarationId(2080), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73328,11 +60678,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2080), -======= - id: DeclarationId(2079), ->>>>>>> origin/main + id: DeclarationId(2081), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73351,11 +60697,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2132, 2157), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2081), -======= - id: DeclarationId(2080), ->>>>>>> origin/main + id: DeclarationId(2082), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73375,20 +60717,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2174, 2190), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2082), -======= - id: DeclarationId(2081), ->>>>>>> origin/main + id: DeclarationId(2083), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2081), -======= - ty: DeclarationId(2080), ->>>>>>> origin/main + ty: DeclarationId(2082), }], }, type_params: vec![], @@ -73402,11 +60736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2162, 2191), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2083), -======= - id: DeclarationId(2082), ->>>>>>> origin/main + id: DeclarationId(2084), name: None, connective: TypeConnective::Conj { children: vec![ @@ -73431,11 +60761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2196, 2247), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2084), -======= - id: DeclarationId(2083), ->>>>>>> origin/main + id: DeclarationId(2085), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73454,11 +60780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2252, 2267), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2085), -======= - id: DeclarationId(2084), ->>>>>>> origin/main + id: DeclarationId(2086), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73477,11 +60799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 2272, 2299), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2086), -======= - id: DeclarationId(2085), ->>>>>>> origin/main + id: DeclarationId(2087), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -73507,11 +60825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 3931, 3949), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2087), -======= - id: DeclarationId(2086), ->>>>>>> origin/main + id: DeclarationId(2088), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73531,16 +60845,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 4537, 4552), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2088), -======= - id: DeclarationId(2087), ->>>>>>> origin/main + id: DeclarationId(2089), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "input_order".to_string(), - ty: DeclarationId(1026), + ty: DeclarationId(1027), }], }, type_params: vec![], @@ -73554,11 +60864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5405, 5459), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2089), -======= - id: DeclarationId(2088), ->>>>>>> origin/main + id: DeclarationId(2090), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73572,11 +60878,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/runtime.dag", 5724, 5733), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2090), -======= - id: DeclarationId(2089), ->>>>>>> origin/main + id: DeclarationId(2091), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -73596,11 +60898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3589, 3617), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2091), -======= - id: DeclarationId(2090), ->>>>>>> origin/main + id: DeclarationId(2092), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -73611,11 +60909,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), -<<<<<<< HEAD - value: DeclarationId(1029), -======= - value: DeclarationId(1028), ->>>>>>> origin/main + value: DeclarationId(1030), }, ], }, @@ -73630,17 +60924,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/services.dag", 6838, 6861), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2092), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1033), -======= - id: DeclarationId(2091), + id: DeclarationId(2093), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1032), ->>>>>>> origin/main + DeclarationId(1034), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -73654,17 +60941,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2329, 2345), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2093), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1033), -======= - id: DeclarationId(2092), + id: DeclarationId(2094), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1032), ->>>>>>> origin/main + DeclarationId(1034), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -73678,17 +60958,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2350, 2366), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2094), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1033), -======= - id: DeclarationId(2093), + id: DeclarationId(2095), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1032), ->>>>>>> origin/main + DeclarationId(1034), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -73702,11 +60975,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2371, 2387), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2095), -======= - id: DeclarationId(2094), ->>>>>>> origin/main + id: DeclarationId(2096), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -73717,11 +60986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), -<<<<<<< HEAD - value: DeclarationId(1033), -======= - value: DeclarationId(1032), ->>>>>>> origin/main + value: DeclarationId(1034), }, ], }, @@ -73736,11 +61001,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2632, 2660), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2096), -======= - id: DeclarationId(2095), ->>>>>>> origin/main + id: DeclarationId(2097), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -73751,11 +61012,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(110), -<<<<<<< HEAD - value: DeclarationId(1033), -======= - value: DeclarationId(1032), ->>>>>>> origin/main + value: DeclarationId(1034), }, ], }, @@ -73770,28 +61027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2704, 2732), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2097), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1041), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 5879, 5901), - }); - declarations.push(Declaration { id: DeclarationId(2098), -======= - id: DeclarationId(2096), ->>>>>>> origin/main name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1042), @@ -73811,7 +61047,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { id: DeclarationId(2099), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(1041), + DeclarationId(1043), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -73853,9 +61089,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 678, 691), }); declarations.push(Declaration { -<<<<<<< HEAD -======= - id: DeclarationId(2100), + id: DeclarationId(2102), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -73869,7 +61103,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 696, 710), }); declarations.push(Declaration { - id: DeclarationId(2101), + id: DeclarationId(2103), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73888,8 +61122,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258), }); declarations.push(Declaration { ->>>>>>> origin/main - id: DeclarationId(2102), + id: DeclarationId(2104), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73905,14 +61138,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/termination.dag", 3232, 3258), -======= span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291), ->>>>>>> origin/main }); declarations.push(Declaration { - id: DeclarationId(2103), + id: DeclarationId(2105), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73928,14 +61157,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/termination.dag", 3263, 3291), -======= span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329), ->>>>>>> origin/main }); declarations.push(Declaration { - id: DeclarationId(2104), + id: DeclarationId(2106), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -73951,74 +61176,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/termination.dag", 3296, 3329), -======= span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365), ->>>>>>> origin/main - }); - declarations.push(Declaration { - id: DeclarationId(2105), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Conj { - children: vec![Field { - label: "param".to_string(), - ty: DeclarationId(197), -======= - connective: TypeConnective::Conj { - children: vec![Field { - label: "param".to_string(), - ty: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402), - }); - declarations.push(Declaration { - id: DeclarationId(2106), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416), }); declarations.push(Declaration { id: DeclarationId(2107), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "previous".to_string(), - ty: DeclarationId(1040), ->>>>>>> origin/main - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365), - }); - declarations.push(Declaration { - id: DeclarationId(2106), - name: None, connective: TypeConnective::Conj { children: vec![Field { label: "param".to_string(), @@ -74055,7 +61217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Conj { children: vec![Field { label: "previous".to_string(), - ty: DeclarationId(1041), + ty: DeclarationId(1042), }], }, type_params: vec![], @@ -74069,7 +61231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4421, 4471), }); declarations.push(Declaration { - id: DeclarationId(2109), + id: DeclarationId(2110), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74083,16 +61245,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4966, 4977), }); declarations.push(Declaration { - id: DeclarationId(2110), + id: DeclarationId(2111), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inner".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1042), -======= - ty: DeclarationId(1041), ->>>>>>> origin/main + ty: DeclarationId(1043), }], }, type_params: vec![], @@ -74106,11 +61264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 4982, 5027), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2111), -======= - id: DeclarationId(2110), ->>>>>>> origin/main + id: DeclarationId(2112), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74129,20 +61283,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7131, 7165), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2112), -======= - id: DeclarationId(2111), ->>>>>>> origin/main + id: DeclarationId(2113), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "amount".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }], }, type_params: vec![], @@ -74156,20 +61302,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7170, 7214), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2113), -======= - id: DeclarationId(2112), ->>>>>>> origin/main + id: DeclarationId(2114), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), -======= - ty: DeclarationId(1040), ->>>>>>> origin/main + ty: DeclarationId(1042), }], }, type_params: vec![], @@ -74183,20 +61321,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7219, 7277), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2114), -======= - id: DeclarationId(2113), ->>>>>>> origin/main + id: DeclarationId(2115), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1042), -======= - ty: DeclarationId(1041), ->>>>>>> origin/main + ty: DeclarationId(1043), }], }, type_params: vec![], @@ -74210,11 +61340,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7282, 7338), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2115), -======= - id: DeclarationId(2114), ->>>>>>> origin/main + id: DeclarationId(2116), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74233,11 +61359,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7343, 7376), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2116), -======= - id: DeclarationId(2115), ->>>>>>> origin/main + id: DeclarationId(2117), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -74256,11 +61378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7381, 7411), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2117), -======= - id: DeclarationId(2116), ->>>>>>> origin/main + id: DeclarationId(2118), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74274,21 +61392,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7416, 7429), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2118), -======= - id: DeclarationId(2117), ->>>>>>> origin/main + id: DeclarationId(2119), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1040), -======= - value: DeclarationId(1039), ->>>>>>> origin/main + value: DeclarationId(1041), }], }, type_params: vec![], @@ -74302,21 +61412,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7469, 7491), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2119), -======= - id: DeclarationId(2118), ->>>>>>> origin/main + id: DeclarationId(2120), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1033), -======= - value: DeclarationId(1032), ->>>>>>> origin/main + value: DeclarationId(1034), }], }, type_params: vec![], @@ -74330,11 +61432,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 7701, 7722), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2120), -======= - id: DeclarationId(2119), ->>>>>>> origin/main + id: DeclarationId(2121), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74348,11 +61446,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 646, 651), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2121), -======= - id: DeclarationId(2120), ->>>>>>> origin/main + id: DeclarationId(2122), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74366,11 +61460,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 656, 660), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2122), -======= - id: DeclarationId(2121), ->>>>>>> origin/main + id: DeclarationId(2123), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74384,11 +61474,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 665, 671), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2123), -======= - id: DeclarationId(2122), ->>>>>>> origin/main + id: DeclarationId(2124), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74402,11 +61488,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 676, 682), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2124), -======= - id: DeclarationId(2123), ->>>>>>> origin/main + id: DeclarationId(2125), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74420,11 +61502,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 687, 691), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2125), -======= - id: DeclarationId(2124), ->>>>>>> origin/main + id: DeclarationId(2126), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74438,11 +61516,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 696, 702), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2126), -======= - id: DeclarationId(2125), ->>>>>>> origin/main + id: DeclarationId(2127), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74456,11 +61530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 707, 716), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2127), -======= - id: DeclarationId(2126), ->>>>>>> origin/main + id: DeclarationId(2128), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74474,11 +61544,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 721, 729), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2128), -======= - id: DeclarationId(2127), ->>>>>>> origin/main + id: DeclarationId(2129), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74492,11 +61558,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 734, 742), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2129), -======= - id: DeclarationId(2128), ->>>>>>> origin/main + id: DeclarationId(2130), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74510,11 +61572,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 747, 754), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2130), -======= - id: DeclarationId(2129), ->>>>>>> origin/main + id: DeclarationId(2131), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74528,11 +61586,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 759, 765), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2131), -======= - id: DeclarationId(2130), ->>>>>>> origin/main + id: DeclarationId(2132), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74546,11 +61600,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 770, 777), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2132), -======= - id: DeclarationId(2131), ->>>>>>> origin/main + id: DeclarationId(2133), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74564,11 +61614,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 782, 788), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2133), -======= - id: DeclarationId(2132), ->>>>>>> origin/main + id: DeclarationId(2134), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -74582,49 +61628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 793, 800), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2134), -======= - id: DeclarationId(2133), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 805, 818), - }); - declarations.push(Declaration { - id: DeclarationId(2134), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "_0".to_string(), - ty: DeclarationId(81), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/tokenize.dag", 823, 834), - }); - declarations.push(Declaration { id: DeclarationId(2135), ->>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75661,7 +62665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2581, 2585), }); declarations.push(Declaration { - id: DeclarationId(2207), + id: DeclarationId(2208), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75675,7 +62679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/tokenize.dag", 2590, 2598), }); declarations.push(Declaration { - id: DeclarationId(2208), + id: DeclarationId(2209), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -75695,30 +62699,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14633, 14656), }); declarations.push(Declaration { -<<<<<<< HEAD -======= - id: DeclarationId(2208), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(1072), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873), - }); - declarations.push(Declaration { ->>>>>>> origin/main - id: DeclarationId(2209), + id: DeclarationId(2210), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -75735,25 +62716,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, -<<<<<<< HEAD span: SourceSpan::new("src/v3/std/verification.dag", 14858, 14873), -======= - span: SourceSpan::new("src/v3/std/verification.dag", 14878, 14898), - }); - declarations.push(Declaration { - id: DeclarationId(2210), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/verification.dag", 2480, 2494), ->>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(2211), @@ -75762,7 +62725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1075), + value: DeclarationId(1076), }], }, type_params: vec![], @@ -75874,7 +62837,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 2583, 2606), }); declarations.push(Declaration { - id: DeclarationId(2218), + id: DeclarationId(2219), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75888,7 +62851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3012, 3021), }); declarations.push(Declaration { - id: DeclarationId(2219), + id: DeclarationId(2220), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -75907,11 +62870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3026, 3042), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2220), -======= - id: DeclarationId(2219), ->>>>>>> origin/main + id: DeclarationId(2221), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75925,11 +62884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3701, 3709), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2221), -======= - id: DeclarationId(2220), ->>>>>>> origin/main + id: DeclarationId(2222), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75943,11 +62898,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 3714, 3724), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2222), -======= - id: DeclarationId(2221), ->>>>>>> origin/main + id: DeclarationId(2223), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75961,11 +62912,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4539, 4552), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2223), -======= - id: DeclarationId(2222), ->>>>>>> origin/main + id: DeclarationId(2224), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75979,11 +62926,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4557, 4570), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2224), -======= - id: DeclarationId(2223), ->>>>>>> origin/main + id: DeclarationId(2225), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -75997,11 +62940,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4575, 4583), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2225), -======= - id: DeclarationId(2224), ->>>>>>> origin/main + id: DeclarationId(2226), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -76015,20 +62954,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4608, 4616), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2226), -======= - id: DeclarationId(2225), ->>>>>>> origin/main + id: DeclarationId(2227), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1067), -======= - ty: DeclarationId(1066), ->>>>>>> origin/main + ty: DeclarationId(1068), }], }, type_params: vec![], @@ -76042,11 +62973,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4621, 4661), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2227), -======= - id: DeclarationId(2226), ->>>>>>> origin/main + id: DeclarationId(2228), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76065,11 +62992,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4666, 4699), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2228), -======= - id: DeclarationId(2227), ->>>>>>> origin/main + id: DeclarationId(2229), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76079,11 +63002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "state".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1068), -======= - ty: DeclarationId(1067), ->>>>>>> origin/main + ty: DeclarationId(1069), }, ], }, @@ -76098,11 +63017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4704, 4782), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2229), -======= - id: DeclarationId(2228), ->>>>>>> origin/main + id: DeclarationId(2230), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76121,11 +63036,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 4948, 5011), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2230), -======= - id: DeclarationId(2229), ->>>>>>> origin/main + id: DeclarationId(2231), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76154,37 +63065,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5016, 5107), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2231), -======= - id: DeclarationId(2230), ->>>>>>> origin/main + id: DeclarationId(2232), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "input_sample".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "expected_output".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "input_sample".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "expected_output".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76199,29 +63094,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5112, 5244), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2232), -======= - id: DeclarationId(2231), ->>>>>>> origin/main + id: DeclarationId(2233), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "invariant".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "invariant".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76236,60 +63119,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 5459, 5548), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2233), -======= - id: DeclarationId(2232), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/verification.dag", 6348, 6360), - }); - declarations.push(Declaration { - id: DeclarationId(2233), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "command".to_string(), - ty: DeclarationId(197), - }, - Field { - label: "args".to_string(), - ty: DeclarationId(2232), - }, - Field { - label: "expect_exit_code".to_string(), - ty: DeclarationId(81), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/verification.dag", 6297, 6394), - }); - declarations.push(Declaration { id: DeclarationId(2234), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -76358,7 +63188,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7094, 7106), }); declarations.push(Declaration { - id: DeclarationId(2236), + id: DeclarationId(2237), name: None, connective: TypeConnective::Conj { children: vec![ @@ -76368,7 +63198,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "args".to_string(), - ty: DeclarationId(2235), + ty: DeclarationId(2236), }, Field { label: "expect_exit_code".to_string(), @@ -76387,33 +63217,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7044, 7140), }); declarations.push(Declaration { - id: DeclarationId(2237), + id: DeclarationId(2238), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "lens_ref".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "input_ref".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "expected_ref".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "expected_ref".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76428,37 +63246,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7438, 7560), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2238), -======= - id: DeclarationId(2237), ->>>>>>> origin/main + id: DeclarationId(2239), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject_ref".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "oracle_ref".to_string(), - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "oracle_ref".to_string(), - ty: DeclarationId(1085), - }, - Field { - label: "input_ref".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76473,29 +63275,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 7822, 7947), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2239), -======= - id: DeclarationId(2238), ->>>>>>> origin/main + id: DeclarationId(2240), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "left_report_ref".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "right_report_ref".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "right_report_ref".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76510,29 +63300,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 8514, 8626), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2240), -======= - id: DeclarationId(2239), ->>>>>>> origin/main + id: DeclarationId(2241), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "law".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1069), - }, - Field { - label: "lens_ref".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1068), + ty: DeclarationId(1070), }, Field { label: "lens_ref".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76547,29 +63325,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9222, 9301), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2241), -======= - id: DeclarationId(2240), ->>>>>>> origin/main + id: DeclarationId(2242), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1058), -======= - ty: DeclarationId(1085), - }, - Field { - label: "list_constant".to_string(), - ty: DeclarationId(1057), ->>>>>>> origin/main + ty: DeclarationId(1059), }, Field { label: "bound".to_string(), @@ -76588,37 +63354,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9521, 9634), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2242), -======= - id: DeclarationId(2241), ->>>>>>> origin/main + id: DeclarationId(2243), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1058), + ty: DeclarationId(1059), }, Field { label: "subset_predicate".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "list_constant".to_string(), - ty: DeclarationId(1057), - }, - Field { - label: "subset_predicate".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76633,29 +63383,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9639, 9775), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2243), -======= - id: DeclarationId(2242), ->>>>>>> origin/main + id: DeclarationId(2244), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "compile_target".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1056), - }, - Field { - label: "expected".to_string(), ty: DeclarationId(1057), -======= - ty: DeclarationId(1055), }, Field { label: "expected".to_string(), - ty: DeclarationId(1056), ->>>>>>> origin/main + ty: DeclarationId(1058), }, ], }, @@ -76670,29 +63408,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9780, 9862), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2244), -======= - id: DeclarationId(2243), ->>>>>>> origin/main + id: DeclarationId(2245), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "ratchet_kind".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "ratchet_kind".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76707,21 +63433,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9867, 9953), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2245), -======= - id: DeclarationId(2244), ->>>>>>> origin/main + id: DeclarationId(2246), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1056), -======= - value: DeclarationId(1055), ->>>>>>> origin/main + value: DeclarationId(1057), }], }, type_params: vec![], @@ -76735,29 +63453,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10032, 10042), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2246), -======= - id: DeclarationId(2245), ->>>>>>> origin/main + id: DeclarationId(2247), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "generated_paths".to_string(), - ty: DeclarationId(2245), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "generated_paths".to_string(), - ty: DeclarationId(2244), ->>>>>>> origin/main + ty: DeclarationId(2246), }, ], }, @@ -76772,37 +63478,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 9958, 10048), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2247), -======= - id: DeclarationId(2246), ->>>>>>> origin/main + id: DeclarationId(2248), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1086), + ty: DeclarationId(1087), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), - }, - Field { - label: "target_lane".to_string(), - ty: DeclarationId(1085), - }, - Field { - label: "authority_doc".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76817,37 +63507,21 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 10990, 11124), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2248), -======= - id: DeclarationId(2247), ->>>>>>> origin/main + id: DeclarationId(2249), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1086), - }, - Field { - label: "target_lane".to_string(), - ty: DeclarationId(1086), - }, - Field { - label: "authority_doc".to_string(), - ty: DeclarationId(1086), -======= - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1085), + ty: DeclarationId(1087), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1085), ->>>>>>> origin/main + ty: DeclarationId(1087), }, ], }, @@ -76862,11 +63536,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 11763, 11907), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2249), -======= - id: DeclarationId(2248), ->>>>>>> origin/main + id: DeclarationId(2250), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -76885,51 +63555,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 12752, 12806), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2250), -======= - id: DeclarationId(2249), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(1018), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/verification.dag", 13850, 13873), - }); - declarations.push(Declaration { - id: DeclarationId(2250), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(1072), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934), - }); - declarations.push(Declaration { id: DeclarationId(2251), ->>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -76955,8 +63581,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1073), + value: DeclarationId(1074), }], }, type_params: vec![], @@ -76970,13 +63595,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 13919, 13934), }); declarations.push(Declaration { - id: DeclarationId(2252), + id: DeclarationId(2253), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(1017), + value: DeclarationId(1018), }], }, type_params: vec![], @@ -76990,16 +63615,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/verification.dag", 14190, 14213), }); declarations.push(Declaration { - id: DeclarationId(2253), + id: DeclarationId(2254), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), - value: DeclarationId(743), -======= value: DeclarationId(744), ->>>>>>> origin/main }], }, type_params: vec![], @@ -77013,11 +63635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/workflows.dag", 992, 1006), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2254), -======= - id: DeclarationId(2253), ->>>>>>> origin/main + id: DeclarationId(2255), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77031,11 +63649,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 532, 547), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2255), -======= - id: DeclarationId(2254), ->>>>>>> origin/main + id: DeclarationId(2256), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77049,11 +63663,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 550, 561), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2256), -======= - id: DeclarationId(2255), ->>>>>>> origin/main + id: DeclarationId(2257), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77067,11 +63677,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/pipeline.dag", 564, 576), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2257), -======= - id: DeclarationId(2256), ->>>>>>> origin/main + id: DeclarationId(2258), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(723), @@ -77088,11 +63694,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2258), -======= - id: DeclarationId(2257), ->>>>>>> origin/main + id: DeclarationId(2259), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77106,11 +63708,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5552, 5570), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2259), -======= - id: DeclarationId(2258), ->>>>>>> origin/main + id: DeclarationId(2260), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77124,11 +63722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5575, 5590), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2260), -======= - id: DeclarationId(2259), ->>>>>>> origin/main + id: DeclarationId(2261), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77142,11 +63736,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5619, 5640), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2261), -======= - id: DeclarationId(2260), ->>>>>>> origin/main + id: DeclarationId(2262), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77160,11 +63750,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 5645, 5660), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2262), -======= - id: DeclarationId(2261), ->>>>>>> origin/main + id: DeclarationId(2263), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77178,11 +63764,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7257, 7267), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2263), -======= - id: DeclarationId(2262), ->>>>>>> origin/main + id: DeclarationId(2264), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77196,11 +63778,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7272, 7283), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2264), -======= - id: DeclarationId(2263), ->>>>>>> origin/main + id: DeclarationId(2265), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77214,11 +63792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7288, 7301), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2265), -======= - id: DeclarationId(2264), ->>>>>>> origin/main + id: DeclarationId(2266), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77232,11 +63806,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7306, 7319), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2266), -======= - id: DeclarationId(2265), ->>>>>>> origin/main + id: DeclarationId(2267), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77250,11 +63820,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7324, 7337), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2267), -======= - id: DeclarationId(2266), ->>>>>>> origin/main + id: DeclarationId(2268), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77268,11 +63834,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7342, 7356), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2268), -======= - id: DeclarationId(2267), ->>>>>>> origin/main + id: DeclarationId(2269), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77286,11 +63848,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 7361, 7376), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2269), -======= - id: DeclarationId(2268), ->>>>>>> origin/main + id: DeclarationId(2270), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77304,11 +63862,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8118, 8135), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2270), -======= - id: DeclarationId(2269), ->>>>>>> origin/main + id: DeclarationId(2271), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77322,11 +63876,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8140, 8150), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2271), -======= - id: DeclarationId(2270), ->>>>>>> origin/main + id: DeclarationId(2272), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -77340,56 +63890,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8155, 8159), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2272), - name: None, - connective: TypeConnective::Conj { - children: vec![ - Field { - label: "target_name".to_string(), - ty: DeclarationId(197), - }, - Field { - label: "algebra".to_string(), - ty: DeclarationId(1468), - }, - Field { - label: "carrier".to_string(), - ty: DeclarationId(1470), - }, - Field { - label: "range_min_inclusive".to_string(), - ty: DeclarationId(197), - }, - Field { - label: "range_max_inclusive".to_string(), - ty: DeclarationId(197), - }, - Field { - label: "is_copy".to_string(), - ty: DeclarationId(99), - }, - Field { - label: "overflow".to_string(), - ty: DeclarationId(1471), - }, - ], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509), - }); - declarations.push(Declaration { id: DeclarationId(2273), -======= - id: DeclarationId(2271), ->>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![ @@ -77403,10 +63904,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "carrier".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1470), -======= - ty: DeclarationId(1469), + ty: DeclarationId(1471), }, Field { label: "range_min_inclusive".to_string(), @@ -77422,7 +63920,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "overflow".to_string(), - ty: DeclarationId(1470), + ty: DeclarationId(1472), }, ], }, @@ -77437,7 +63935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8937, 9509), }); declarations.push(Declaration { - id: DeclarationId(2272), + id: DeclarationId(2274), name: None, connective: TypeConnective::Conj { children: vec![ @@ -77447,12 +63945,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "algebra".to_string(), - ty: DeclarationId(1468), ->>>>>>> origin/main + ty: DeclarationId(1470), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1469), + ty: DeclarationId(1471), }, Field { label: "is_copy".to_string(), @@ -77471,21 +63968,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9514, 9696), }); declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(2274), -======= - id: DeclarationId(2273), ->>>>>>> origin/main + id: DeclarationId(2275), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1472), -======= - value: DeclarationId(1471), ->>>>>>> origin/main + value: DeclarationId(1473), }], }, type_params: vec![], @@ -77613,11 +64102,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(13), Port { id: PortId(13), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1693))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), produced_by: Some(NodeId(9)), }, ); @@ -77641,11 +64126,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(16), Port { id: PortId(16), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), produced_by: None, }, ); @@ -77653,11 +64134,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(17), Port { id: PortId(17), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1697))), produced_by: Some(NodeId(11)), }, ); @@ -77945,11 +64422,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(53), Port { id: PortId(53), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1697))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1698))), produced_by: None, }, ); @@ -78813,11 +65286,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(161), Port { id: PortId(161), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1698))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1697))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1699))), produced_by: None, }, ); @@ -78841,11 +65310,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(164), Port { id: PortId(164), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), produced_by: Some(NodeId(113)), }, ); @@ -78861,11 +65326,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(166), Port { id: PortId(166), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1699))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1698))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1700))), produced_by: Some(NodeId(115)), }, ); @@ -78873,11 +65334,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(167), Port { id: PortId(167), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1700))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1699))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1701))), produced_by: None, }, ); @@ -78981,11 +65438,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(180), Port { id: PortId(180), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1701))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1700))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1702))), produced_by: Some(NodeId(128)), }, ); @@ -79129,11 +65582,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(198), Port { id: PortId(198), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1702))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1701))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1703))), produced_by: None, }, ); @@ -79245,11 +65694,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(212), Port { id: PortId(212), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1703))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1702))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1704))), produced_by: None, }, ); @@ -79361,11 +65806,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(226), Port { id: PortId(226), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1704))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1703))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1705))), produced_by: None, }, ); @@ -79981,11 +66422,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(303), Port { id: PortId(303), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1705))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1704))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1706))), produced_by: None, }, ); @@ -80097,11 +66534,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(317), Port { id: PortId(317), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1706))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1705))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1707))), produced_by: Some(NodeId(227)), }, ); @@ -80109,11 +66542,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(318), Port { id: PortId(318), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1707))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1706))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1708))), produced_by: None, }, ); @@ -80169,11 +66598,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(325), Port { id: PortId(325), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1708))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1707))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1709))), produced_by: Some(NodeId(234)), }, ); @@ -80181,11 +66606,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(326), Port { id: PortId(326), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1709))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1708))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1710))), produced_by: None, }, ); @@ -80201,11 +66622,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(328), Port { id: PortId(328), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(1710))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(1709))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1711))), produced_by: Some(NodeId(237)), }, ); @@ -80221,11 +66638,7 @@ fn bootstrapped_fixture_dag_ports() -> HashMap { PortId(330), Port { id: PortId(330), -<<<<<<< HEAD - state: PortState::Resolved(TypeShape::new(DeclarationId(2253))), -======= - state: PortState::Resolved(TypeShape::new(DeclarationId(2252))), ->>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(2254))), produced_by: Some(NodeId(239)), }, ); diff --git a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs index ba19040d6cd..7feb2daedbc 100644 --- a/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs +++ b/src/v3/compiler/src/bootstrap_generated_without_parse_surface.rs @@ -8,11 +8,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { ports: bootstrapped_fixture_without_parse_surface_dag_ports(), diagnostics: bootstrapped_fixture_without_parse_surface_dag_diagnostics(), next_node_id: 275, -<<<<<<< HEAD - next_declaration_id: 2192, -======= - next_declaration_id: 2191, ->>>>>>> origin/main + next_declaration_id: 2193, next_port_id: 371, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -27,11 +23,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { callable_strategy_variants: CallableStrategyVariants::default(), clusters: bootstrapped_fixture_without_parse_surface_dag_clusters(), optional_match_disjs: bootstrapped_fixture_without_parse_surface_dag_optional_match_disjs(), -<<<<<<< HEAD - declaration_append_begin_after_bootstrap: 2192, -======= - declaration_append_begin_after_bootstrap: 2191, ->>>>>>> origin/main + declaration_append_begin_after_bootstrap: 2193, } } @@ -126,33 +118,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(7), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1717)), -======= - target: TransformTarget::Callable(DeclarationId(1716)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1718)), inputs: vec![PortId(9)], output: PortId(11), span: SourceSpan::new("src/v3/std/algebra.dag", 10402, 10414), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(8), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1719)), -======= - target: TransformTarget::Callable(DeclarationId(1718)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1720)), inputs: vec![PortId(11)], output: PortId(12), span: SourceSpan::new("src/v3/std/algebra.dag", 10395, 10442), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(9), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1679)), -======= - target: TransformTarget::Callable(DeclarationId(1678)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1680)), inputs: vec![PortId(9), PortId(10), PortId(12)], output: PortId(13), span: SourceSpan::new("src/v3/std/algebra.dag", 10056, 10446), @@ -168,11 +148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(11), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1681)), -======= - target: TransformTarget::Callable(DeclarationId(1680)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1682)), inputs: vec![PortId(14), PortId(15), PortId(16)], output: PortId(17), span: SourceSpan::new("src/v3/std/algebra.dag", 10577, 10633), @@ -188,11 +164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(13), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1720)), -======= - target: TransformTarget::Callable(DeclarationId(1719)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1721)), inputs: vec![PortId(18)], output: PortId(19), span: SourceSpan::new("src/v3/std/algebra.dag", 10702, 10717), @@ -345,11 +317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(27), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1714)), -======= - target: TransformTarget::Callable(DeclarationId(1713)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1715)), inputs: vec![PortId(35)], output: PortId(36), span: SourceSpan::new("src/v3/std/algebra.dag", 11232, 11256), @@ -379,11 +347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(31), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1712)), -======= - target: TransformTarget::Callable(DeclarationId(1711)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1713)), inputs: vec![PortId(40)], output: PortId(41), span: SourceSpan::new("src/v3/std/algebra.dag", 11525, 11560), @@ -513,22 +477,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(43), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1708)), -======= - target: TransformTarget::Callable(DeclarationId(1707)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(54)], output: PortId(55), span: SourceSpan::new("src/v3/std/algebra.dag", 13121, 13136), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(44), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1722)), -======= - target: TransformTarget::Callable(DeclarationId(1721)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1723)), inputs: vec![PortId(53), PortId(55)], output: PortId(56), span: SourceSpan::new("src/v3/std/algebra.dag", 13109, 13152), @@ -1238,11 +1194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(91), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1724)), -======= - target: TransformTarget::Callable(DeclarationId(1723)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1725)), inputs: vec![PortId(136), PortId(137)], output: PortId(138), span: SourceSpan::new("src/v3/std/algebra.dag", 15818, 15928), @@ -1270,11 +1222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(95), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1726)), -======= - target: TransformTarget::Callable(DeclarationId(1725)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1727)), inputs: vec![PortId(141), PortId(142)], output: PortId(143), span: SourceSpan::new("src/v3/std/algebra.dag", 15983, 16093), @@ -1577,11 +1525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(113), target: TransformTarget::FieldProject { field_label: "rest".to_string(), -<<<<<<< HEAD - field_child: Some(DeclarationId(1493)), -======= - field_child: Some(DeclarationId(1492)), ->>>>>>> origin/main + field_child: Some(DeclarationId(1494)), }, inputs: vec![PortId(161)], output: PortId(164), @@ -1589,22 +1533,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(114), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1727)), -======= - target: TransformTarget::Callable(DeclarationId(1726)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1728)), inputs: vec![PortId(163), PortId(164)], output: PortId(165), span: SourceSpan::new("src/v3/std/algebra.dag", 17366, 17396), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(115), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1728)), -======= - target: TransformTarget::Callable(DeclarationId(1727)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1729)), inputs: vec![PortId(162), PortId(165)], output: PortId(166), span: SourceSpan::new("src/v3/std/algebra.dag", 17348, 17397), @@ -1620,11 +1556,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(117), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1729)), -======= - target: TransformTarget::Callable(DeclarationId(1728)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1730)), inputs: vec![], output: PortId(168), span: SourceSpan::new("src/v3/std/algebra.dag", 17667, 17674), @@ -1692,11 +1624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(125), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1730)), -======= - target: TransformTarget::Callable(DeclarationId(1729)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1731)), inputs: vec![PortId(174), PortId(176)], output: PortId(177), span: SourceSpan::new("src/v3/std/algebra.dag", 17792, 17835), @@ -1943,11 +1871,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(141), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1708)), -======= - target: TransformTarget::Callable(DeclarationId(1707)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(199)], output: PortId(200), span: SourceSpan::new("src/v3/std/algebra.dag", 18968, 18983), @@ -1994,11 +1918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(146), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1731)), -======= - target: TransformTarget::Callable(DeclarationId(1730)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1732)), inputs: vec![PortId(205), PortId(206)], output: PortId(207), span: SourceSpan::new("src/v3/std/algebra.dag", 19105, 19137), @@ -2095,11 +2015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(153), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1708)), -======= - target: TransformTarget::Callable(DeclarationId(1707)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(213)], output: PortId(214), span: SourceSpan::new("src/v3/std/algebra.dag", 19239, 19254), @@ -2163,11 +2079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(160), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1714)), -======= - target: TransformTarget::Callable(DeclarationId(1713)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1715)), inputs: vec![PortId(222)], output: PortId(223), span: SourceSpan::new("src/v3/std/algebra.dag", 19357, 19416), @@ -2250,11 +2162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(165), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1708)), -======= - target: TransformTarget::Callable(DeclarationId(1707)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1709)), inputs: vec![PortId(227)], output: PortId(228), span: SourceSpan::new("src/v3/std/algebra.dag", 19705, 19720), @@ -2355,11 +2263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(176), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1712)), -======= - target: TransformTarget::Callable(DeclarationId(1711)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1713)), inputs: vec![PortId(241)], output: PortId(242), span: SourceSpan::new("src/v3/std/algebra.dag", 19947, 20010), @@ -2831,11 +2735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(205), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1712)), -======= - target: TransformTarget::Callable(DeclarationId(1711)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1713)), inputs: vec![PortId(291)], output: PortId(292), span: SourceSpan::new("src/v3/std/algebra.dag", 21393, 21421), @@ -2930,11 +2830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(216), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1732)), -======= - target: TransformTarget::Callable(DeclarationId(1731)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1733)), inputs: vec![], output: PortId(305), span: SourceSpan::new("src/v3/std/algebra.dag", 21776, 21783), @@ -3002,11 +2898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(224), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1733)), -======= - target: TransformTarget::Callable(DeclarationId(1732)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1734)), inputs: vec![PortId(311), PortId(313)], output: PortId(314), span: SourceSpan::new("src/v3/std/algebra.dag", 21924, 21989), @@ -3095,11 +2987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(230), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1735)), -======= - target: TransformTarget::Callable(DeclarationId(1734)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1736)), inputs: vec![PortId(318), PortId(320)], output: PortId(321), span: SourceSpan::new("src/v3/std/algebra.dag", 22107, 22165), @@ -3120,11 +3008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(233), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1736)), -======= - target: TransformTarget::Callable(DeclarationId(1735)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1737)), inputs: vec![PortId(319), PortId(323)], output: PortId(324), span: SourceSpan::new("src/v3/std/algebra.dag", 22191, 22237), @@ -3167,22 +3051,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(236), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1737)), -======= - target: TransformTarget::Callable(DeclarationId(1736)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1738)), inputs: vec![], output: PortId(327), span: SourceSpan::new("src/v3/std/algebra.dag", 22508, 22515), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(237), -<<<<<<< HEAD - target: TransformTarget::Callable(DeclarationId(1739)), -======= - target: TransformTarget::Callable(DeclarationId(1738)), ->>>>>>> origin/main + target: TransformTarget::Callable(DeclarationId(1740)), inputs: vec![PortId(326), PortId(327)], output: PortId(328), span: SourceSpan::new("src/v3/std/algebra.dag", 22496, 22537), @@ -3200,11 +3076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(239), target: TransformTarget::FieldProject { field_label: "nodes".to_string(), -<<<<<<< HEAD - field_child: Some(DeclarationId(1670)), -======= - field_child: Some(DeclarationId(1669)), ->>>>>>> origin/main + field_child: Some(DeclarationId(1671)), }, inputs: vec![PortId(329)], output: PortId(330), @@ -3772,11 +3644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { #[allow(clippy::vec_init_then_push)] fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec { { -<<<<<<< HEAD - let mut declarations = Vec::with_capacity(2192); -======= - let mut declarations = Vec::with_capacity(2191); ->>>>>>> origin/main + let mut declarations = Vec::with_capacity(2193); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -16224,19 +16092,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1492), }, ], }, @@ -16269,11 +16129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1460), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3273, 3284)), }, type_params: vec![DeclarationId(607)], @@ -16304,13 +16160,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(609), DeclarationId(1461)], + output: DeclarationId(1462), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3453, 3475)), }, type_params: vec![DeclarationId(609)], @@ -16342,11 +16193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1463), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 3570, 3590)), }, type_params: vec![DeclarationId(611)], @@ -16377,11 +16224,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1464), DeclarationId(614), DeclarationId(1465)], output: DeclarationId(614), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4203, 4307)), }, @@ -16427,11 +16270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1466), DeclarationId(617), DeclarationId(1467)], output: DeclarationId(617), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 4658, 4768)), }, @@ -16477,13 +16316,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1468), DeclarationId(1469)], + output: DeclarationId(1470), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5386, 5414)), }, type_params: vec![DeclarationId(619)], @@ -16514,13 +16348,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1471), DeclarationId(1472)], + output: DeclarationId(1473), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5721, 5778)), }, type_params: vec![DeclarationId(621), DeclarationId(622)], @@ -16565,13 +16394,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1474), DeclarationId(1475)], + output: DeclarationId(1476), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 5905, 5988)), }, type_params: vec![DeclarationId(624)], @@ -16602,13 +16426,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1477), DeclarationId(1479)], + output: DeclarationId(1480), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6171, 6230)), }, type_params: vec![DeclarationId(626), DeclarationId(627)], @@ -16653,11 +16472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1481)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6372, 6409)), }, @@ -16689,11 +16504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1482)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 6605, 6671)), }, @@ -16764,13 +16575,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1483)], + output: DeclarationId(1485), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7238, 7269)), }, type_params: vec![DeclarationId(635)], @@ -16801,13 +16607,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1486), DeclarationId(81)], + output: DeclarationId(1488), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 7463, 7644)), }, type_params: vec![DeclarationId(637)], @@ -16838,11 +16639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1489), DeclarationId(639)], output: DeclarationId(99), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/list.dag", 8205, 8332)), }, @@ -16937,11 +16734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1493), }, ], }, @@ -16984,11 +16777,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1494), }, ], }, @@ -17023,19 +16812,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1510), }, ], }, @@ -17055,11 +16836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1511), }], }, type_params: vec![], @@ -17079,19 +16856,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1514), }, ], }, @@ -17112,19 +16881,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1516), }, ], }, @@ -17179,11 +16940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1495), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 11761, 12044)), }, type_params: vec![], @@ -17203,27 +16960,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1518), }, Field { label: "DeleteEffect".to_string(), - ty: DeclarationId(1517), + ty: DeclarationId(1519), }, ], }, @@ -17244,19 +16989,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1521), }, ], }, @@ -17277,19 +17014,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1523), }, ], }, @@ -17310,19 +17039,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1525), }, ], }, @@ -17343,27 +17064,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, Field { label: "InputField".to_string(), - ty: DeclarationId(1525), + ty: DeclarationId(1527), }, Field { label: "CompositeKey".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1528), -======= - ty: DeclarationId(1527), ->>>>>>> origin/main + ty: DeclarationId(1529), }, ], }, @@ -17384,27 +17093,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1531), }, Field { label: "NonIdempotent".to_string(), - ty: DeclarationId(1530), + ty: DeclarationId(1532), }, ], }, @@ -17486,27 +17183,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1534), }, Field { label: "MalformedPathInput".to_string(), - ty: DeclarationId(1533), + ty: DeclarationId(1535), }, ], }, @@ -17527,19 +17212,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1538), }, ], }, @@ -17576,11 +17253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1496), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 20944, 20966)), }, type_params: vec![], @@ -17597,13 +17270,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1497)], + output: DeclarationId(1499), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21060, 21153)), }, type_params: vec![], @@ -17620,13 +17288,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1500)], + output: DeclarationId(1502), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 21240, 21423)), }, type_params: vec![], @@ -17643,11 +17306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1503)], output: DeclarationId(665), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 22313, 22436)), }, @@ -17712,35 +17371,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, Field { label: "LoopEffect".to_string(), - ty: DeclarationId(1541), + ty: DeclarationId(1543), }, Field { label: "ParallelEffect".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1544), -======= - ty: DeclarationId(1543), ->>>>>>> origin/main + ty: DeclarationId(1545), }, ], }, @@ -17790,19 +17433,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1547), }, ], }, @@ -17841,43 +17476,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1552), }, ], }, @@ -17927,19 +17542,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1554), }, ], }, @@ -17994,11 +17601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1504), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 29707, 30005)), }, type_params: vec![], @@ -18033,11 +17636,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1505), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30476, 30628)), }, @@ -18055,11 +17654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1506), DeclarationId(167)], output: DeclarationId(657), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 30706, 30858)), }, @@ -18116,27 +17711,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1556), }, Field { label: "DerivationUnknown".to_string(), - ty: DeclarationId(1555), + ty: DeclarationId(1557), }, ], }, @@ -18157,19 +17740,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1559), }, ], }, @@ -18307,13 +17882,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1507)], + output: DeclarationId(1508), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/effects.dag", 37296, 37566)), }, type_params: vec![], @@ -18381,27 +17951,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1568), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(1567), + ty: DeclarationId(1569), }, ], }, @@ -18430,11 +17988,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1570), }, ], }, @@ -18455,27 +18009,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1572), }, Field { label: "LitString".to_string(), - ty: DeclarationId(1571), + ty: DeclarationId(1573), }, ], }, @@ -18496,43 +18038,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1578), }, ], }, @@ -18553,27 +18075,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1580), }, Field { label: "UnitCount".to_string(), - ty: DeclarationId(1579), + ty: DeclarationId(1581), }, ], }, @@ -18594,19 +18104,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1583), }, ], }, @@ -18627,19 +18129,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1585), }, ], }, @@ -18694,19 +18188,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1588), }, ], }, @@ -18727,27 +18213,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1590), }, Field { label: "Unbounded".to_string(), - ty: DeclarationId(1589), + ty: DeclarationId(1591), }, ], }, @@ -18843,51 +18317,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, Field { label: "Variant".to_string(), - ty: DeclarationId(1600), + ty: DeclarationId(1601), }, ], }, @@ -18908,27 +18358,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, Field { label: "ValueBodyMap".to_string(), - ty: DeclarationId(1605), + ty: DeclarationId(1606), }, ], }, @@ -18968,43 +18406,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1611), }, ], }, @@ -19025,51 +18443,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, Field { label: "Cardinality".to_string(), - ty: DeclarationId(1617), + ty: DeclarationId(1619), }, Field { label: "Instantiation".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1620), -======= - ty: DeclarationId(1619), ->>>>>>> origin/main + ty: DeclarationId(1621), }, ], }, @@ -19094,71 +18488,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main label: "span".to_string(), ty: DeclarationId(132), }, @@ -19205,11 +18565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1629), }], }, type_params: vec![], @@ -19229,35 +18585,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1633), }, ], }, @@ -19278,51 +18618,27 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1639), }, ], }, @@ -19343,19 +18659,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1641), }, ], }, @@ -19376,27 +18684,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1643), }, Field { label: "Logical".to_string(), - ty: DeclarationId(1642), + ty: DeclarationId(1644), }, ], }, @@ -19417,27 +18713,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, Field { label: "FieldProject".to_string(), - ty: DeclarationId(1646), + ty: DeclarationId(1647), }, Field { label: "Operator".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1647), -======= - ty: DeclarationId(1646), ->>>>>>> origin/main + ty: DeclarationId(1648), }, ], }, @@ -19458,19 +18742,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1650), }, ], }, @@ -19528,11 +18804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1651), }, ], }, @@ -19668,19 +18940,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1653), }, ], }, @@ -19701,19 +18965,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1655), }, ], }, @@ -19768,11 +19024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1656), }, ], }, @@ -19801,11 +19053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1657), }, Field { label: "result_port".to_string(), @@ -19833,11 +19081,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1658), }], }, type_params: vec![], @@ -19865,11 +19109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1659), }, Field { label: "result_port".to_string(), @@ -19881,11 +19121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1660), }, ], }, @@ -19950,11 +19186,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1661), }], }, type_params: vec![], @@ -19986,11 +19218,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1662), }, Field { label: "span".to_string(), @@ -19998,19 +19226,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1664), }, ], }, @@ -20031,43 +19251,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1669), }, ], }, @@ -20088,35 +19288,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1673), }, ], }, @@ -20156,27 +19340,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -20188,45 +19360,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(748), name: Some("port".to_string()), connective: TypeConnective::Arrow { -<<<<<<< HEAD - inputs: vec![DeclarationId(744), DeclarationId(640)], - output: DeclarationId(1560), -======= inputs: vec![DeclarationId(745), DeclarationId(641)], - output: DeclarationId(1558), ->>>>>>> origin/main + output: DeclarationId(1560), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19502, @@ -20247,13 +19388,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1561), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19560, @@ -20274,13 +19410,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1562), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 19635, @@ -20301,13 +19432,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1563), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 20024, @@ -20329,7 +19455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main }, Field { label: "NoRoot".to_string(), - ty: DeclarationId(1673), + ty: DeclarationId(1675), }, Field { label: "AmbiguousRoot".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1676), -======= - ty: DeclarationId(1675), ->>>>>>> origin/main + ty: DeclarationId(1677), }, ], }, @@ -20391,13 +19505,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 23967, @@ -20418,13 +19527,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1565), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/substrate.dag", 24353, @@ -20446,7 +19550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + ty: DeclarationId(1072), }], }, type_params: vec![], @@ -20493,27 +19593,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1698), }, Field { label: "IdentityEffect".to_string(), - ty: DeclarationId(1697), + ty: DeclarationId(1699), }, ], }, @@ -20534,35 +19622,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1703), }, ], }, @@ -20591,27 +19663,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1705), }, Field { label: "callback_element_position".to_string(), - ty: DeclarationId(1704), + ty: DeclarationId(1706), }, ], }, @@ -20651,19 +19711,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1708), }, ], }, @@ -20684,59 +19736,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1716), }, Field { label: "UnknownCost".to_string(), - ty: DeclarationId(1715), + ty: DeclarationId(1717), }, ], }, @@ -20798,11 +19822,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1678), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9870, 9880)), }, type_params: vec![], @@ -20819,13 +19839,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1679), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/algebra.dag", 9954, 9969)), }, type_params: vec![], @@ -20842,15 +19857,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -20866,15 +19875,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -20998,15 +20001,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21076,15 +20073,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21100,15 +20091,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21142,15 +20127,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21166,15 +20145,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21190,15 +20163,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21345,15 +20312,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21369,15 +20330,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21393,15 +20348,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -21420,17 +20369,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + DeclarationId(1742), + DeclarationId(1743), ], output: DeclarationId(804), body: ArrowBody::Unparsed(SourceSpan::new( @@ -21456,20 +20398,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + value: DeclarationId(1018), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1743)), -======= - meta_tag: Some(DeclarationId(1742)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1744)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![])), @@ -21484,19 +20418,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1748), }, ], }, @@ -21517,19 +20443,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1751), }, ], }, @@ -21550,19 +20468,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1753), }, ], }, @@ -21583,59 +20493,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1760), }, ], }, @@ -21718,11 +20600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1761), }, Field { label: "model".to_string(), @@ -21734,11 +20612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1762), }, Field { label: "usage".to_string(), @@ -21763,43 +20637,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1767), }, ], }, @@ -21820,27 +20674,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1769), }, Field { label: "DecimalPrecision".to_string(), - ty: DeclarationId(1768), + ty: DeclarationId(1770), }, ], }, @@ -21861,27 +20703,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1772), }, Field { label: "QuietAndSignalingNaN".to_string(), - ty: DeclarationId(1771), + ty: DeclarationId(1773), }, ], }, @@ -21902,19 +20732,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1775), }, ], }, @@ -21935,19 +20757,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1777), }, ], }, @@ -21968,27 +20782,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1779), }, Field { label: "FlushToZero".to_string(), - ty: DeclarationId(1778), + ty: DeclarationId(1780), }, ], }, @@ -22038,11 +20840,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1781), }, Field { label: "rounding".to_string(), @@ -22101,11 +20899,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -22126,43 +20920,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1786), }, ], }, @@ -22219,627 +20993,399 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/bit.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/error_primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/magnitude.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/nat.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/integer.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/rational.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/float.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/types.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/string_type.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/unicode.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/render_repeat_string_bootstrap.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "dsl/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1781), -======= - constructor: DeclarationId(1780), ->>>>>>> origin/main + constructor: DeclarationId(1782), payload: vec![], }, ), ( "src/v3/std/algebra.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/anthropic_messages.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/anthropic_operations.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/anthropic_schema.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/approximate_field.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/bin_shim.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/bootstrap_authority.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/bridge_ledger.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/clean_emission.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/computation.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/computation_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/diagnostics.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/dimensions.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/effects.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/emit_model.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/extdeps_bootstrap_fixtures.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/go_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/induction.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/integer_diagnostic_order.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/lens.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/list.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/lookup.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/methods.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/parse_surface.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/python_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/resources.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/runtime.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/rust_method_template_contracts.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/services.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/substrate.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/substrate_minimal.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/termination.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/tokenize.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/verification.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/std/workflows.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1782), -======= - constructor: DeclarationId(1781), ->>>>>>> origin/main + constructor: DeclarationId(1783), payload: vec![], }, ), ( "src/v3/spec/v3_l1.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1783), -======= - constructor: DeclarationId(1782), ->>>>>>> origin/main + constructor: DeclarationId(1784), payload: vec![], }, ), ( "src/v3/spec/go.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1783), -======= - constructor: DeclarationId(1782), ->>>>>>> origin/main + constructor: DeclarationId(1784), payload: vec![], }, ), ( "src/v3/spec/python.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1783), -======= - constructor: DeclarationId(1782), ->>>>>>> origin/main + constructor: DeclarationId(1784), payload: vec![], }, ), ( "src/v3/spec/rust.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1783), -======= - constructor: DeclarationId(1782), ->>>>>>> origin/main + constructor: DeclarationId(1784), payload: vec![], }, ), ( "src/v3/compiler/pipeline.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1784), -======= - constructor: DeclarationId(1783), ->>>>>>> origin/main + constructor: DeclarationId(1785), payload: vec![], }, ), ( "src/v3/compiler/operators.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1784), -======= - constructor: DeclarationId(1783), ->>>>>>> origin/main + constructor: DeclarationId(1785), payload: vec![], }, ), ( "src/v3/compiler/regen.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1784), -======= - constructor: DeclarationId(1783), ->>>>>>> origin/main + constructor: DeclarationId(1785), payload: vec![], }, ), ( "dsl/extdeps/languages/rust/primitives.dag".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1785), -======= - constructor: DeclarationId(1784), ->>>>>>> origin/main + constructor: DeclarationId(1786), payload: vec![], }, ), @@ -22857,19 +21403,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1788), }, ], }, @@ -22889,11 +21427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }], }, type_params: vec![], @@ -22939,11 +21473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + declarations.push(Declaration { id: DeclarationId(821), name: Some("bridge_ledger".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(820) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(1789)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_source_span_file_participation_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R3".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("ROADMAP.md#lens-fold-file-path-semantics".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_mark_bootstrap_secret_nominal_opacity_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #937".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_dispatch_pr1183_slice_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("R2-Substrate".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1787), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("src/v3/compiler/tests/integration/canonical_lens_bridge_ratchet_test.rs".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_canonical_lens_name_patching_residual".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Runtime".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/briefs/r2-pb-canonical-lens-bridge-disposition.md".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_include_str_side_channels_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("pipeline_authority".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("PR #1171".to_string())))]), FieldValue::Record(vec![("name".to_string(), FieldValue::Literal(LiteralBits::String("bridge_exact_string_patching_residual_retired".to_string()))), ("owner".to_string(), FieldValue::Literal(LiteralBits::String("PB-Tier-2".to_string()))), ("status".to_string(), FieldValue::Variant { constructor: DeclarationId(1788), payload: vec![] }), ("authority".to_string(), FieldValue::Literal(LiteralBits::String("docs/r3-structure.md:83".to_string())))])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/bridge_ledger.dag", 6558, 8315) }); declarations.push(Declaration { id: DeclarationId(822), name: Some("CleanEmissionContract".to_string()), @@ -23029,27 +21559,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1791), }, Field { label: "NoWrapping".to_string(), - ty: DeclarationId(1790), + ty: DeclarationId(1792), }, ], }, @@ -23070,35 +21588,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1796), }, ], }, @@ -23119,19 +21621,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1798), }, ], }, @@ -23152,27 +21646,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1800), }, Field { label: "ImportPerUsageSite".to_string(), - ty: DeclarationId(1799), + ty: DeclarationId(1801), }, ], }, @@ -23193,27 +21675,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1803), }, Field { label: "ExplicitReturnKeyword".to_string(), - ty: DeclarationId(1802), + ty: DeclarationId(1804), }, ], }, @@ -23234,27 +21704,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1806), }, Field { label: "OmitLetBinding".to_string(), - ty: DeclarationId(1805), + ty: DeclarationId(1807), }, ], }, @@ -23275,27 +21733,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1809), }, Field { label: "NotApplicableMatchArmBody".to_string(), - ty: DeclarationId(1808), + ty: DeclarationId(1810), }, ], }, @@ -23353,11 +21799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1811), }, Field { label: "syntax_only".to_string(), @@ -23390,35 +21832,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1815), }, ], }, @@ -23439,67 +21865,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1827), }, ], }, @@ -23539,11 +21933,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1027)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", @@ -23568,67 +21958,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1835), }, ], }, @@ -23649,27 +22007,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1837), }, Field { label: "ProportionalShrink".to_string(), - ty: DeclarationId(1836), + ty: DeclarationId(1838), }, ], }, @@ -23690,27 +22036,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1840), }, Field { label: "Repeat".to_string(), - ty: DeclarationId(1839), + ty: DeclarationId(1841), }, ], }, @@ -23739,19 +22073,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1842), }, ], }, @@ -23791,13 +22117,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1816), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 5369, @@ -23862,13 +22183,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1817), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 6297, @@ -23892,27 +22208,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1844), }, Field { label: "ArithmeticRepeat".to_string(), - ty: DeclarationId(1843), + ty: DeclarationId(1845), }, ], }, @@ -23931,11 +22235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1818), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7370, @@ -23957,11 +22257,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1819), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/computation.dag", 7935, @@ -23985,19 +22281,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1847), }, ], }, @@ -24018,19 +22306,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1849), }, ], }, @@ -24051,19 +22331,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1851), }, ], }, @@ -24084,19 +22356,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1853), }, ], }, @@ -24160,44 +22424,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1846), payload: vec![], }, ), ( "purity".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1847), -======= - constructor: DeclarationId(1846), ->>>>>>> origin/main + constructor: DeclarationId(1848), payload: vec![], }, ), ( "structure".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1849), -======= - constructor: DeclarationId(1848), ->>>>>>> origin/main + constructor: DeclarationId(1850), payload: vec![], }, ), ( "iteration".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1851), -======= - constructor: DeclarationId(1850), ->>>>>>> origin/main + constructor: DeclarationId(1852), payload: vec![], }, ), @@ -24214,35 +22462,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1857), }, ], }, @@ -24263,19 +22495,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1859), }, ], }, @@ -24320,11 +22544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1860), }], }, type_params: vec![], @@ -24348,11 +22568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1861), }, ], }, @@ -24400,19 +22616,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1863), }, ], }, @@ -24433,59 +22641,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1870), }, ], }, @@ -24559,11 +22739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }], }, type_params: vec![], @@ -24583,19 +22759,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1872), }, ], }, @@ -24628,11 +22796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1873), }, ], }, @@ -24653,59 +22817,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1881), }, ], }, @@ -24726,19 +22862,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1897), }, ], }, @@ -24773,19 +22901,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1899), }, ], }, @@ -24806,19 +22926,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1906), }, ], }, @@ -24857,19 +22969,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, Field { label: "compose".to_string(), - ty: DeclarationId(1907), + ty: DeclarationId(1909), }, Field { label: "identity".to_string(), @@ -24877,11 +22981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1910), }, ], }, @@ -24920,13 +23020,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + algebra: DeclarationId(1911), }], meta_tag: None, specialization_parent: None, @@ -25067,19 +23162,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1885), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4316, 4338)), }, type_params: vec![DeclarationId(887), DeclarationId(888)], @@ -25108,23 +23195,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -25139,11 +23212,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main phantom_params: Vec::new(), meta_tag: None, specialization_parent: None, @@ -25198,8 +23261,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + inputs: vec![DeclarationId(1893), DeclarationId(1894), DeclarationId(897)], + output: DeclarationId(1895), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/dimensions.dag", 4895, 4924)), }, type_params: vec![DeclarationId(896), DeclarationId(897)], @@ -25298,19 +23356,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "carrier".to_string(), @@ -25322,11 +23372,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1912), }, Field { label: "cost".to_string(), @@ -25351,27 +23397,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "bound".to_string(), @@ -25379,11 +23413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -25404,19 +23434,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1914), }, ], }, @@ -25466,19 +23488,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1916), }, ], }, @@ -25499,27 +23513,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "carrier".to_string(), @@ -25548,19 +23550,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "carrier".to_string(), @@ -25589,19 +23583,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "strategy".to_string(), @@ -25609,11 +23595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1917), }, Field { label: "cost".to_string(), @@ -25663,19 +23645,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1919), }, ], }, @@ -25696,19 +23670,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1921), }, ], }, @@ -25729,19 +23695,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1923), }, ], }, @@ -25762,27 +23720,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1925), }, Field { label: "NotApplicable".to_string(), - ty: DeclarationId(1924), + ty: DeclarationId(1926), }, ], }, @@ -25802,11 +23748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1927), }], }, type_params: vec![], @@ -25826,19 +23768,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "carrier".to_string(), @@ -25867,83 +23801,43 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1937), }, ], }, @@ -25964,19 +23858,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "strategy".to_string(), @@ -25984,19 +23870,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, Field { label: "scrutinee".to_string(), @@ -26041,19 +23919,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1939), }, ], }, @@ -26516,19 +24386,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1941), }, ], }, @@ -26549,19 +24411,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1943), }, ], }, @@ -26582,99 +24436,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -26695,19 +24501,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1945), }, ], }, @@ -26728,19 +24526,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1947), }, ], }, @@ -26924,11 +24714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1948)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -26947,11 +24733,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -26964,11 +24746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -26990,11 +24768,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Join({recv}, {arg})".to_string(), ))], @@ -27007,11 +24781,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27033,11 +24803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "strings.Split({recv}, {arg})".to_string(), ))], @@ -27050,11 +24816,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27076,11 +24838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg}...)".to_string(), ))], @@ -27093,11 +24851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27119,11 +24873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Map({recv}, {arg})".to_string(), ))], @@ -27136,11 +24886,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27162,11 +24908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Filter({recv}, {arg})".to_string(), ))], @@ -27179,11 +24921,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27205,11 +24943,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Any({recv}, {arg})".to_string(), ))], @@ -27222,11 +24956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27248,11 +24978,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.All({recv}, {arg})".to_string(), ))], @@ -27265,11 +24991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27291,11 +25013,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.FlatMap({recv}, {arg})".to_string(), ))], @@ -27308,11 +25026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27332,11 +25046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -27349,11 +25059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27373,11 +25079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -27390,11 +25092,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27416,11 +25114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.Fold({recv}, {arg})".to_string(), ))], @@ -27433,11 +25127,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27459,11 +25149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "v2rt.SortBy({recv}, {arg})".to_string(), ))], @@ -27476,11 +25162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27502,11 +25184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "append({recv}, {arg})".to_string(), ))], @@ -27519,11 +25197,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -27540,43 +25214,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1962), }, ], }, @@ -27667,13 +25321,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1026), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/induction.dag", 8701, 8732)), }, type_params: vec![], @@ -27693,43 +25342,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1967), }, ], }, @@ -27747,13 +25376,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1019), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 11067, @@ -27884,13 +25508,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1949), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 20518, @@ -27911,13 +25530,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1950), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 21906, @@ -27941,35 +25555,19 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1971), }, ], }, @@ -28012,19 +25610,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1973), }, ], }, @@ -28045,59 +25635,31 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1983), }, Field { label: "ErrorBound".to_string(), - ty: DeclarationId(1982), + ty: DeclarationId(1984), }, ], }, @@ -28115,13 +25677,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 27827, @@ -28396,11 +25953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1952), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 31955, @@ -28422,11 +25975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1953), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 32251, @@ -28448,11 +25997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1954), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33500, @@ -28474,11 +26019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1955), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 33975, @@ -28500,11 +26041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1956), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35238, @@ -28531,11 +26068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1957), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/induction.dag", 35510, @@ -28938,20 +26471,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + value: DeclarationId(1072), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1984)), -======= - meta_tag: Some(DeclarationId(1983)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1985)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -28972,20 +26497,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + value: DeclarationId(1072), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1985)), -======= - meta_tag: Some(DeclarationId(1984)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1986)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -29010,43 +26527,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1992), }, ], }, @@ -29081,19 +26578,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1996), }, ], }, @@ -29126,11 +26615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1993), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4589, 4599)), }, type_params: vec![], @@ -29148,11 +26633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1994), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/lookup.dag", 4642, 4654)), }, type_params: vec![], @@ -29177,11 +26658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1997)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ @@ -29200,11 +26677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "len({recv})".to_string(), ))], @@ -29217,11 +26690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29241,11 +26710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{arg}.join({recv})".to_string(), ))], @@ -29258,11 +26723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29282,11 +26743,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}.split({arg})".to_string(), ))], @@ -29299,11 +26756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29325,11 +26778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[-1] if {recv} else None".to_string(), ))], @@ -29342,11 +26791,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29368,11 +26813,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[0] if {recv} else None".to_string(), ))], @@ -29385,11 +26826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29411,11 +26848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "list(enumerate({recv}))".to_string(), ))], @@ -29428,11 +26861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29454,11 +26883,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "[ord(c) for c in {recv}]".to_string(), ))], @@ -29471,11 +26896,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29495,11 +26916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + {arg}".to_string(), ))], @@ -29512,11 +26929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29538,11 +26951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "[{arg}(x) for x in {recv}]".to_string(), ))], @@ -29555,11 +26964,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29581,11 +26986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "[x for x in {recv} if {arg}(x)]".to_string(), ))], @@ -29598,11 +26999,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29624,11 +27021,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "any({arg}(x) for x in {recv})".to_string(), ))], @@ -29641,11 +27034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29667,11 +27056,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "all({arg}(x) for x in {recv})".to_string(), ))], @@ -29684,11 +27069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29710,11 +27091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "[y for x in {recv} for y in {arg}(x)]".to_string(), ))], @@ -29727,11 +27104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29751,11 +27124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[{arg}:]".to_string(), ))], @@ -29768,11 +27137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29792,11 +27157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv}[:{arg}]".to_string(), ))], @@ -29809,11 +27170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29835,11 +27192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "functools.reduce({arg}, {recv})".to_string(), ))], @@ -29852,11 +27205,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29878,11 +27227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "sorted({recv}, key={arg})".to_string(), ))], @@ -29895,11 +27240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29919,11 +27260,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String( "{recv} + [{arg}]".to_string(), ))], @@ -29936,11 +27273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1945), payload: vec![], }, ), @@ -29993,11 +27326,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1072), }], }, type_params: vec![], @@ -30042,43 +27371,23 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(2003), }, ], }, @@ -30131,11 +27440,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(2004), }], }, type_params: vec![], @@ -30154,49 +27459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }], }, type_params: vec![], @@ -30210,12 +27473,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); - declarations.push(Declaration { - id: DeclarationId(1014), -======= - declarations.push(Declaration { id: DeclarationId(1012), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(935) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2006)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1944), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1943), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); + declarations.push(Declaration { id: DeclarationId(1014), name: Some("rust_method_template_contracts".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), value: DeclarationId(935) }] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(2008)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(225)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.len()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("({recv}.len() as i64)".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(237)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.join(&{arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(261)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.split(&{arg}).map(|s| s.to_string()).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(239)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.last().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(231)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.first().cloned()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(229)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().enumerate().map(|(i, v)| (i, v.clone())).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().enumerate().map(|(i, v)| (i as i64, v)).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(219)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.chars().map(|c| c as i64).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(230)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { if {body} { __result.push({param}); } } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.filter({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(216)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __found = false; for {param} in {iter} { if {body} { __found = true; break; } } __found }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.any({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(215)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __all = true; for {param} in {iter} { if !({body}) { __all = false; break; } } __all }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.all({arg})".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(false))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(232)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1947), payload: vec![FieldValue::Literal(LiteralBits::String("{ let mut __result = Vec::new(); for {param} in {iter} { __result.extend({inner_iter}); } __result }".to_string())), FieldValue::Literal(LiteralBits::String("{iter}.flat_map({arg}).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(259)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().skip({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })]), FieldValue::Record(vec![("dag_method".to_string(), FieldValue::Record(vec![("decl".to_string(), FieldValue::Reference(DeclarationId(264)))])), ("runtime_template".to_string(), FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))), ("emit_template".to_string(), FieldValue::Variant { constructor: DeclarationId(1946), payload: vec![FieldValue::Literal(LiteralBits::String("{recv}.iter().cloned().take({arg} as usize).collect::>()".to_string()))] }), ("wraps_result".to_string(), FieldValue::Literal(LiteralBits::Bool(true))), ("placeholder_convention".to_string(), FieldValue::Variant { constructor: DeclarationId(1945), payload: vec![] })])])), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/std/rust_method_template_contracts.dag", 3552, 7991) }); declarations.push(Declaration { - id: DeclarationId(1013), ->>>>>>> origin/main + id: DeclarationId(1015), name: Some("InputField".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -30321,11 +27578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1016), name: Some("RestEndpointBinding".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -30350,20 +27603,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1017), name: Some("CallableRef".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "decl".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }], }, type_params: vec![], @@ -30377,37 +27622,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1018), name: Some("Operation".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "callable".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1016), - }, - Field { - label: "inputs".to_string(), - ty: DeclarationId(2008), - }, - Field { - label: "endpoint".to_string(), - ty: DeclarationId(1015), -======= - ty: DeclarationId(1015), + ty: DeclarationId(1017), }, Field { label: "inputs".to_string(), - ty: DeclarationId(2007), + ty: DeclarationId(2009), }, Field { label: "endpoint".to_string(), - ty: DeclarationId(1014), ->>>>>>> origin/main + ty: DeclarationId(1016), }, ], }, @@ -30422,37 +27651,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1019), name: Some("DescentEvidence".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Strict".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2016), - }, - Field { - label: "NonIncreasing".to_string(), ty: DeclarationId(2017), }, - Field { - label: "DescentUnknown".to_string(), - ty: DeclarationId(2018), -======= - ty: DeclarationId(2015), - }, Field { label: "NonIncreasing".to_string(), - ty: DeclarationId(2016), ->>>>>>> origin/main + ty: DeclarationId(2018), }, Field { label: "DescentUnknown".to_string(), - ty: DeclarationId(2017), + ty: DeclarationId(2019), }, ], }, @@ -30467,17 +27680,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1019)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 756, 838)), }, @@ -30492,19 +27698,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1019), DeclarationId(1019)], + output: DeclarationId(1019), body: ArrowBody::Unparsed(SourceSpan::new("src/v3/std/termination.dag", 982, 1310)), }, type_params: vec![], @@ -30518,19 +27716,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1019), DeclarationId(1019)], + output: DeclarationId(1019), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 1456, @@ -30548,19 +27738,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1019)], + output: DeclarationId(1019), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2117, @@ -30578,19 +27760,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(2010), DeclarationId(2011)], + output: DeclarationId(2012), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2388, @@ -30608,19 +27782,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(2013), DeclarationId(197), DeclarationId(1019)], + output: DeclarationId(2014), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 2733, @@ -30638,53 +27804,29 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1026), name: Some("RankingDimension".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TreeSize".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2019), - }, - Field { - label: "ListLength".to_string(), ty: DeclarationId(2020), }, - Field { - label: "ArithmeticValue".to_string(), - ty: DeclarationId(2021), - }, - Field { - label: "TokenPosition".to_string(), - ty: DeclarationId(2022), - }, - Field { - label: "SetCardinality".to_string(), - ty: DeclarationId(2023), -======= - ty: DeclarationId(2018), - }, Field { label: "ListLength".to_string(), - ty: DeclarationId(2019), + ty: DeclarationId(2021), }, Field { label: "ArithmeticValue".to_string(), - ty: DeclarationId(2020), + ty: DeclarationId(2022), }, Field { label: "TokenPosition".to_string(), - ty: DeclarationId(2021), + ty: DeclarationId(2023), }, Field { label: "SetCardinality".to_string(), - ty: DeclarationId(2022), ->>>>>>> origin/main + ty: DeclarationId(2024), }, ], }, @@ -30699,29 +27841,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1027), name: Some("PositiveDescentAmount".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OneStep".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2024), - }, - Field { - label: "AdditionalStep".to_string(), ty: DeclarationId(2025), -======= - ty: DeclarationId(2023), }, Field { label: "AdditionalStep".to_string(), - ty: DeclarationId(2024), ->>>>>>> origin/main + ty: DeclarationId(2026), }, ], }, @@ -30736,29 +27866,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1028), name: Some("ProportionalDivisor".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "DivideByTwo".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2026), - }, - Field { - label: "StrictlyLarger".to_string(), ty: DeclarationId(2027), -======= - ty: DeclarationId(2025), }, Field { label: "StrictlyLarger".to_string(), - ty: DeclarationId(2026), ->>>>>>> origin/main + ty: DeclarationId(2028), }, ], }, @@ -30773,17 +27891,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1028)], output: DeclarationId(81), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", @@ -30802,11 +27913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1030), name: Some("peano_literal_materialization_cap".to_string()), connective: TypeConnective::Arrow { inputs: vec![], @@ -30828,19 +27935,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(2015), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 5902, @@ -30858,19 +27957,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(2016), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/termination.dag", 6342, @@ -30888,69 +27979,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1033), name: Some("DescentSource".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "ChildAccessor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2028), - }, - Field { - label: "ListShrink".to_string(), ty: DeclarationId(2029), }, - Field { - label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2030), - }, - Field { - label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2031), - }, - Field { - label: "ParserAdvance".to_string(), - ty: DeclarationId(2032), - }, - Field { - label: "SetRemoval".to_string(), - ty: DeclarationId(2033), - }, - Field { - label: "FoldIteration".to_string(), - ty: DeclarationId(2034), -======= - ty: DeclarationId(2027), - }, Field { label: "ListShrink".to_string(), - ty: DeclarationId(2028), + ty: DeclarationId(2030), }, Field { label: "ArithmeticSubtractDescent".to_string(), - ty: DeclarationId(2029), + ty: DeclarationId(2031), }, Field { label: "ArithmeticDivideDescent".to_string(), - ty: DeclarationId(2030), + ty: DeclarationId(2032), }, Field { label: "ParserAdvance".to_string(), - ty: DeclarationId(2031), + ty: DeclarationId(2033), }, Field { label: "SetRemoval".to_string(), - ty: DeclarationId(2032), + ty: DeclarationId(2034), }, Field { label: "FoldIteration".to_string(), - ty: DeclarationId(2033), ->>>>>>> origin/main + ty: DeclarationId(2035), }, ], }, @@ -30965,20 +28024,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1034), name: Some("TerminationProof".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "dimensions".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2035), -======= - ty: DeclarationId(2034), ->>>>>>> origin/main + ty: DeclarationId(2036), }], }, type_params: vec![], @@ -30992,11 +28043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1035), name: Some("ProofEdge".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -31010,11 +28057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(2037), }, ], }, @@ -31029,381 +28072,193 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1036), name: Some("TokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2037), - }, - Field { - label: "KwIf".to_string(), ty: DeclarationId(2038), }, - Field { - label: "KwThen".to_string(), - ty: DeclarationId(2039), - }, - Field { - label: "KwElse".to_string(), - ty: DeclarationId(2040), - }, - Field { - label: "KwFn".to_string(), - ty: DeclarationId(2041), - }, - Field { - label: "KwType".to_string(), - ty: DeclarationId(2042), - }, - Field { - label: "KwService".to_string(), - ty: DeclarationId(2043), - }, - Field { - label: "KwModule".to_string(), - ty: DeclarationId(2044), - }, - Field { - label: "KwImport".to_string(), - ty: DeclarationId(2045), - }, - Field { - label: "KwMatch".to_string(), - ty: DeclarationId(2046), - }, - Field { - label: "KwData".to_string(), - ty: DeclarationId(2047), - }, - Field { - label: "KwWhere".to_string(), - ty: DeclarationId(2048), - }, - Field { - label: "KwTrue".to_string(), - ty: DeclarationId(2049), - }, - Field { - label: "KwFalse".to_string(), - ty: DeclarationId(2050), - }, - Field { - label: "Ident".to_string(), - ty: DeclarationId(2051), - }, - Field { - label: "IntLit".to_string(), - ty: DeclarationId(2052), - }, - Field { - label: "StringLit".to_string(), - ty: DeclarationId(2053), - }, - Field { - label: "Eq".to_string(), - ty: DeclarationId(2054), - }, - Field { - label: "EqEq".to_string(), - ty: DeclarationId(2055), - }, - Field { - label: "NotEq".to_string(), - ty: DeclarationId(2056), - }, - Field { - label: "Lt".to_string(), - ty: DeclarationId(2057), - }, - Field { - label: "Le".to_string(), - ty: DeclarationId(2058), - }, - Field { - label: "Gt".to_string(), - ty: DeclarationId(2059), - }, - Field { - label: "Ge".to_string(), - ty: DeclarationId(2060), - }, - Field { - label: "Plus".to_string(), - ty: DeclarationId(2061), - }, - Field { - label: "Minus".to_string(), - ty: DeclarationId(2062), - }, - Field { - label: "Star".to_string(), - ty: DeclarationId(2063), - }, - Field { - label: "Slash".to_string(), - ty: DeclarationId(2064), - }, - Field { - label: "AmpAmp".to_string(), - ty: DeclarationId(2065), - }, - Field { - label: "PipePipe".to_string(), - ty: DeclarationId(2066), - }, - Field { - label: "Colon".to_string(), - ty: DeclarationId(2067), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(2068), - }, - Field { - label: "FatArrow".to_string(), - ty: DeclarationId(2069), - }, - Field { - label: "PipeArrow".to_string(), - ty: DeclarationId(2070), - }, - Field { - label: "Dot".to_string(), - ty: DeclarationId(2071), - }, - Field { - label: "LParen".to_string(), - ty: DeclarationId(2072), - }, - Field { - label: "RParen".to_string(), - ty: DeclarationId(2073), - }, - Field { - label: "LBrace".to_string(), - ty: DeclarationId(2074), - }, - Field { - label: "RBrace".to_string(), - ty: DeclarationId(2075), - }, - Field { - label: "LBracket".to_string(), - ty: DeclarationId(2076), - }, - Field { - label: "RBracket".to_string(), - ty: DeclarationId(2077), - }, - Field { - label: "Comma".to_string(), - ty: DeclarationId(2078), - }, - Field { - label: "Semicolon".to_string(), - ty: DeclarationId(2079), - }, - Field { - label: "Pipe".to_string(), - ty: DeclarationId(2080), - }, - Field { - label: "Question".to_string(), - ty: DeclarationId(2081), - }, - Field { - label: "Eof".to_string(), - ty: DeclarationId(2082), -======= - ty: DeclarationId(2036), - }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2037), + ty: DeclarationId(2039), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2038), + ty: DeclarationId(2040), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2039), + ty: DeclarationId(2041), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2040), + ty: DeclarationId(2042), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2041), + ty: DeclarationId(2043), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2042), + ty: DeclarationId(2044), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2043), + ty: DeclarationId(2045), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2044), + ty: DeclarationId(2046), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2045), + ty: DeclarationId(2047), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2046), + ty: DeclarationId(2048), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2047), + ty: DeclarationId(2049), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2048), + ty: DeclarationId(2050), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2049), + ty: DeclarationId(2051), }, Field { label: "Ident".to_string(), - ty: DeclarationId(2050), + ty: DeclarationId(2052), }, Field { label: "IntLit".to_string(), - ty: DeclarationId(2051), + ty: DeclarationId(2053), }, Field { label: "StringLit".to_string(), - ty: DeclarationId(2052), + ty: DeclarationId(2054), }, Field { label: "Eq".to_string(), - ty: DeclarationId(2053), + ty: DeclarationId(2055), }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2054), + ty: DeclarationId(2056), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2055), + ty: DeclarationId(2057), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2056), + ty: DeclarationId(2058), }, Field { label: "Le".to_string(), - ty: DeclarationId(2057), + ty: DeclarationId(2059), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2058), + ty: DeclarationId(2060), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2059), + ty: DeclarationId(2061), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2060), + ty: DeclarationId(2062), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2061), + ty: DeclarationId(2063), }, Field { label: "Star".to_string(), - ty: DeclarationId(2062), + ty: DeclarationId(2064), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2063), + ty: DeclarationId(2065), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2064), + ty: DeclarationId(2066), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2065), + ty: DeclarationId(2067), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2066), + ty: DeclarationId(2068), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2067), + ty: DeclarationId(2069), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2068), + ty: DeclarationId(2070), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2069), + ty: DeclarationId(2071), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2070), + ty: DeclarationId(2072), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2071), + ty: DeclarationId(2073), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2072), + ty: DeclarationId(2074), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2073), + ty: DeclarationId(2075), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2074), + ty: DeclarationId(2076), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2075), + ty: DeclarationId(2077), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2076), + ty: DeclarationId(2078), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2077), + ty: DeclarationId(2079), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2078), + ty: DeclarationId(2080), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2079), + ty: DeclarationId(2081), }, Field { label: "Question".to_string(), - ty: DeclarationId(2080), + ty: DeclarationId(2082), }, Field { label: "Eof".to_string(), - ty: DeclarationId(2081), ->>>>>>> origin/main + ty: DeclarationId(2083), }, ], }, @@ -31418,21 +28273,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1037), name: Some("Token".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1035), -======= - ty: DeclarationId(1034), ->>>>>>> origin/main + ty: DeclarationId(1036), }, Field { label: "span".to_string(), @@ -31451,125 +28298,65 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1038), name: Some("KeywordTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "KwLet".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2083), - }, - Field { - label: "KwIf".to_string(), ty: DeclarationId(2084), }, - Field { - label: "KwThen".to_string(), - ty: DeclarationId(2085), - }, - Field { - label: "KwElse".to_string(), - ty: DeclarationId(2086), - }, - Field { - label: "KwFn".to_string(), - ty: DeclarationId(2087), - }, - Field { - label: "KwType".to_string(), - ty: DeclarationId(2088), - }, - Field { - label: "KwService".to_string(), - ty: DeclarationId(2089), - }, - Field { - label: "KwModule".to_string(), - ty: DeclarationId(2090), - }, - Field { - label: "KwImport".to_string(), - ty: DeclarationId(2091), - }, - Field { - label: "KwMatch".to_string(), - ty: DeclarationId(2092), - }, - Field { - label: "KwData".to_string(), - ty: DeclarationId(2093), - }, - Field { - label: "KwWhere".to_string(), - ty: DeclarationId(2094), - }, - Field { - label: "KwTrue".to_string(), - ty: DeclarationId(2095), - }, - Field { - label: "KwFalse".to_string(), - ty: DeclarationId(2096), -======= - ty: DeclarationId(2082), - }, Field { label: "KwIf".to_string(), - ty: DeclarationId(2083), + ty: DeclarationId(2085), }, Field { label: "KwThen".to_string(), - ty: DeclarationId(2084), + ty: DeclarationId(2086), }, Field { label: "KwElse".to_string(), - ty: DeclarationId(2085), + ty: DeclarationId(2087), }, Field { label: "KwFn".to_string(), - ty: DeclarationId(2086), + ty: DeclarationId(2088), }, Field { label: "KwType".to_string(), - ty: DeclarationId(2087), + ty: DeclarationId(2089), }, Field { label: "KwService".to_string(), - ty: DeclarationId(2088), + ty: DeclarationId(2090), }, Field { label: "KwModule".to_string(), - ty: DeclarationId(2089), + ty: DeclarationId(2091), }, Field { label: "KwImport".to_string(), - ty: DeclarationId(2090), + ty: DeclarationId(2092), }, Field { label: "KwMatch".to_string(), - ty: DeclarationId(2091), + ty: DeclarationId(2093), }, Field { label: "KwData".to_string(), - ty: DeclarationId(2092), + ty: DeclarationId(2094), }, Field { label: "KwWhere".to_string(), - ty: DeclarationId(2093), + ty: DeclarationId(2095), }, Field { label: "KwTrue".to_string(), - ty: DeclarationId(2094), + ty: DeclarationId(2096), }, Field { label: "KwFalse".to_string(), - ty: DeclarationId(2095), ->>>>>>> origin/main + ty: DeclarationId(2097), }, ], }, @@ -31584,237 +28371,121 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1039), name: Some("PunctTokenKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Eq".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2097), - }, - Field { - label: "EqEq".to_string(), ty: DeclarationId(2098), }, - Field { - label: "NotEq".to_string(), - ty: DeclarationId(2099), - }, - Field { - label: "Lt".to_string(), - ty: DeclarationId(2100), - }, - Field { - label: "Le".to_string(), - ty: DeclarationId(2101), - }, - Field { - label: "Gt".to_string(), - ty: DeclarationId(2102), - }, - Field { - label: "Ge".to_string(), - ty: DeclarationId(2103), - }, - Field { - label: "Plus".to_string(), - ty: DeclarationId(2104), - }, - Field { - label: "Minus".to_string(), - ty: DeclarationId(2105), - }, - Field { - label: "Star".to_string(), - ty: DeclarationId(2106), - }, - Field { - label: "Slash".to_string(), - ty: DeclarationId(2107), - }, - Field { - label: "AmpAmp".to_string(), - ty: DeclarationId(2108), - }, - Field { - label: "PipePipe".to_string(), - ty: DeclarationId(2109), - }, - Field { - label: "Colon".to_string(), - ty: DeclarationId(2110), - }, - Field { - label: "Arrow".to_string(), - ty: DeclarationId(2111), - }, - Field { - label: "FatArrow".to_string(), - ty: DeclarationId(2112), - }, - Field { - label: "PipeArrow".to_string(), - ty: DeclarationId(2113), - }, - Field { - label: "Dot".to_string(), - ty: DeclarationId(2114), - }, - Field { - label: "LParen".to_string(), - ty: DeclarationId(2115), - }, - Field { - label: "RParen".to_string(), - ty: DeclarationId(2116), - }, - Field { - label: "LBrace".to_string(), - ty: DeclarationId(2117), - }, - Field { - label: "RBrace".to_string(), - ty: DeclarationId(2118), - }, - Field { - label: "LBracket".to_string(), - ty: DeclarationId(2119), - }, - Field { - label: "RBracket".to_string(), - ty: DeclarationId(2120), - }, - Field { - label: "Comma".to_string(), - ty: DeclarationId(2121), - }, - Field { - label: "Semicolon".to_string(), - ty: DeclarationId(2122), - }, - Field { - label: "Pipe".to_string(), - ty: DeclarationId(2123), - }, - Field { - label: "Question".to_string(), - ty: DeclarationId(2124), -======= - ty: DeclarationId(2096), - }, Field { label: "EqEq".to_string(), - ty: DeclarationId(2097), + ty: DeclarationId(2099), }, Field { label: "NotEq".to_string(), - ty: DeclarationId(2098), + ty: DeclarationId(2100), }, Field { label: "Lt".to_string(), - ty: DeclarationId(2099), + ty: DeclarationId(2101), }, Field { label: "Le".to_string(), - ty: DeclarationId(2100), + ty: DeclarationId(2102), }, Field { label: "Gt".to_string(), - ty: DeclarationId(2101), + ty: DeclarationId(2103), }, Field { label: "Ge".to_string(), - ty: DeclarationId(2102), + ty: DeclarationId(2104), }, Field { label: "Plus".to_string(), - ty: DeclarationId(2103), + ty: DeclarationId(2105), }, Field { label: "Minus".to_string(), - ty: DeclarationId(2104), + ty: DeclarationId(2106), }, Field { label: "Star".to_string(), - ty: DeclarationId(2105), + ty: DeclarationId(2107), }, Field { label: "Slash".to_string(), - ty: DeclarationId(2106), + ty: DeclarationId(2108), }, Field { label: "AmpAmp".to_string(), - ty: DeclarationId(2107), + ty: DeclarationId(2109), }, Field { label: "PipePipe".to_string(), - ty: DeclarationId(2108), + ty: DeclarationId(2110), }, Field { label: "Colon".to_string(), - ty: DeclarationId(2109), + ty: DeclarationId(2111), }, Field { label: "Arrow".to_string(), - ty: DeclarationId(2110), + ty: DeclarationId(2112), }, Field { label: "FatArrow".to_string(), - ty: DeclarationId(2111), + ty: DeclarationId(2113), }, Field { label: "PipeArrow".to_string(), - ty: DeclarationId(2112), + ty: DeclarationId(2114), }, Field { label: "Dot".to_string(), - ty: DeclarationId(2113), + ty: DeclarationId(2115), }, Field { label: "LParen".to_string(), - ty: DeclarationId(2114), + ty: DeclarationId(2116), }, Field { label: "RParen".to_string(), - ty: DeclarationId(2115), + ty: DeclarationId(2117), }, Field { label: "LBrace".to_string(), - ty: DeclarationId(2116), + ty: DeclarationId(2118), }, Field { label: "RBrace".to_string(), - ty: DeclarationId(2117), + ty: DeclarationId(2119), }, Field { label: "LBracket".to_string(), - ty: DeclarationId(2118), + ty: DeclarationId(2120), }, Field { label: "RBracket".to_string(), - ty: DeclarationId(2119), + ty: DeclarationId(2121), }, Field { label: "Comma".to_string(), - ty: DeclarationId(2120), + ty: DeclarationId(2122), }, Field { label: "Semicolon".to_string(), - ty: DeclarationId(2121), + ty: DeclarationId(2123), }, Field { label: "Pipe".to_string(), - ty: DeclarationId(2122), + ty: DeclarationId(2124), }, Field { label: "Question".to_string(), - ty: DeclarationId(2123), ->>>>>>> origin/main + ty: DeclarationId(2125), }, ], }, @@ -31829,11 +28500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1040), name: Some("LocalPunctSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -31843,11 +28510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1039), }, ], }, @@ -31862,11 +28525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1041), name: Some("StringEscapeSpec".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -31891,11 +28550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1042), name: Some("Path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(131), @@ -31912,11 +28567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1043), name: Some("SnapshotRef".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(122), @@ -31933,11 +28584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1044), name: Some("CensusListConstant".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -31951,26 +28598,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1044), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1043)), -======= - meta_tag: Some(DeclarationId(1042)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1044)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -31979,26 +28615,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1044), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1043)), -======= - meta_tag: Some(DeclarationId(1042)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1044)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -32007,11 +28632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1047), name: Some("LensProducerFilesSubsetPredicate".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32025,26 +28646,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1047), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1046)), -======= - meta_tag: Some(DeclarationId(1045)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1047)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -32053,11 +28663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1049), name: Some("CompilerStdPositiveSetRatchet".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32071,26 +28677,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1049), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1048)), -======= - meta_tag: Some(DeclarationId(1047)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1049)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![] }), @@ -32099,69 +28694,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1051), name: Some("DiagnosticKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TokenizerError".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2128), - }, - Field { - label: "ParseError".to_string(), ty: DeclarationId(2129), }, - Field { - label: "TypeMismatch".to_string(), - ty: DeclarationId(2130), - }, - Field { - label: "UnitMismatch".to_string(), - ty: DeclarationId(2131), - }, - Field { - label: "ArityMismatch".to_string(), - ty: DeclarationId(2132), - }, - Field { - label: "ResolveError".to_string(), - ty: DeclarationId(2133), - }, - Field { - label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2134), -======= - ty: DeclarationId(2127), - }, Field { label: "ParseError".to_string(), - ty: DeclarationId(2128), + ty: DeclarationId(2130), }, Field { label: "TypeMismatch".to_string(), - ty: DeclarationId(2129), + ty: DeclarationId(2131), }, Field { label: "UnitMismatch".to_string(), - ty: DeclarationId(2130), + ty: DeclarationId(2132), }, Field { label: "ArityMismatch".to_string(), - ty: DeclarationId(2131), + ty: DeclarationId(2133), }, Field { label: "ResolveError".to_string(), - ty: DeclarationId(2132), + ty: DeclarationId(2134), }, Field { label: "NominalOpacityViolation".to_string(), - ty: DeclarationId(2133), ->>>>>>> origin/main + ty: DeclarationId(2135), }, ], }, @@ -32176,29 +28739,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1052), name: Some("DiagnosticDetailExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "AnyDetail".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2135), - }, - Field { - label: "Contains".to_string(), ty: DeclarationId(2136), -======= - ty: DeclarationId(2134), }, Field { label: "Contains".to_string(), - ty: DeclarationId(2135), ->>>>>>> origin/main + ty: DeclarationId(2137), }, ], }, @@ -32213,29 +28764,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1053), name: Some("DiagnosticReference".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "kind".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1050), - }, - Field { - label: "detail_contains".to_string(), ty: DeclarationId(1051), -======= - ty: DeclarationId(1049), }, Field { label: "detail_contains".to_string(), - ty: DeclarationId(1050), ->>>>>>> origin/main + ty: DeclarationId(1052), }, ], }, @@ -32250,29 +28789,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1054), name: Some("PortStateExpectation".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Resolved".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2137), - }, - Field { - label: "Unresolved".to_string(), ty: DeclarationId(2138), -======= - ty: DeclarationId(2136), }, Field { label: "Unresolved".to_string(), - ty: DeclarationId(2137), ->>>>>>> origin/main + ty: DeclarationId(2139), }, ], }, @@ -32287,37 +28814,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1055), name: Some("AlgebraicLawKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Associativity".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2139), - }, - Field { - label: "Commutativity".to_string(), ty: DeclarationId(2140), }, - Field { - label: "Identity".to_string(), - ty: DeclarationId(2141), -======= - ty: DeclarationId(2138), - }, Field { label: "Commutativity".to_string(), - ty: DeclarationId(2139), ->>>>>>> origin/main + ty: DeclarationId(2141), }, Field { label: "Identity".to_string(), - ty: DeclarationId(2140), + ty: DeclarationId(2142), }, ], }, @@ -32332,189 +28843,97 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1056), name: Some("TestPredicate".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "Compiles".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2142), - }, - Field { - label: "FailsWithDiagnostic".to_string(), ty: DeclarationId(2143), }, - Field { - label: "OutputEquals".to_string(), - ty: DeclarationId(2144), - }, - Field { - label: "PortHasState".to_string(), - ty: DeclarationId(2145), - }, - Field { - label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2146), - }, - Field { - label: "CostBounded".to_string(), - ty: DeclarationId(2147), - }, - Field { - label: "BehavioralObservation".to_string(), - ty: DeclarationId(2148), - }, - Field { - label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2149), - }, - Field { - label: "ExecuteCommand".to_string(), - ty: DeclarationId(2151), - }, - Field { - label: "ForAllTargets".to_string(), - ty: DeclarationId(2153), - }, - Field { - label: "LensOutputEquals".to_string(), - ty: DeclarationId(2154), - }, - Field { - label: "DifferentialEquals".to_string(), - ty: DeclarationId(2155), - }, - Field { - label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2156), - }, - Field { - label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2157), - }, - Field { - label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2158), - }, - Field { - label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2159), - }, - Field { - label: "FixedPointConverges".to_string(), - ty: DeclarationId(2160), - }, - Field { - label: "RatchetZero".to_string(), - ty: DeclarationId(2161), - }, - Field { - label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2163), - }, - Field { - label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2164), - }, - Field { - label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2165), - }, - Field { - label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2166), -======= - ty: DeclarationId(2141), - }, Field { label: "FailsWithDiagnostic".to_string(), - ty: DeclarationId(2142), + ty: DeclarationId(2144), }, Field { label: "OutputEquals".to_string(), - ty: DeclarationId(2143), + ty: DeclarationId(2145), }, Field { label: "PortHasState".to_string(), - ty: DeclarationId(2144), + ty: DeclarationId(2146), }, Field { label: "DeclarationHasRefinement".to_string(), - ty: DeclarationId(2145), + ty: DeclarationId(2147), }, Field { label: "CostBounded".to_string(), - ty: DeclarationId(2146), + ty: DeclarationId(2148), }, Field { label: "BehavioralObservation".to_string(), - ty: DeclarationId(2147), + ty: DeclarationId(2149), }, Field { label: "MockBackedInvariant".to_string(), - ty: DeclarationId(2148), + ty: DeclarationId(2150), }, Field { label: "ExecuteCommand".to_string(), - ty: DeclarationId(2150), + ty: DeclarationId(2152), }, Field { label: "ForAllTargets".to_string(), - ty: DeclarationId(2152), + ty: DeclarationId(2154), }, Field { label: "LensOutputEquals".to_string(), - ty: DeclarationId(2153), + ty: DeclarationId(2155), }, Field { label: "DifferentialEquals".to_string(), - ty: DeclarationId(2154), + ty: DeclarationId(2156), }, Field { label: "BinaryDimensionReportEquals".to_string(), - ty: DeclarationId(2155), + ty: DeclarationId(2157), }, Field { label: "AlgebraicLaw".to_string(), - ty: DeclarationId(2156), + ty: DeclarationId(2158), }, Field { label: "CensusBoundCheck".to_string(), - ty: DeclarationId(2157), + ty: DeclarationId(2159), }, Field { label: "CensusSubsetCount".to_string(), - ty: DeclarationId(2158), + ty: DeclarationId(2160), }, Field { label: "FixedPointConverges".to_string(), - ty: DeclarationId(2159), + ty: DeclarationId(2161), }, Field { label: "RatchetZero".to_string(), - ty: DeclarationId(2160), + ty: DeclarationId(2162), }, Field { label: "GeneratedFromDag".to_string(), - ty: DeclarationId(2162), + ty: DeclarationId(2164), }, Field { label: "ReleaseDeferredClaim".to_string(), - ty: DeclarationId(2163), + ty: DeclarationId(2165), }, Field { label: "SubstrateResearchDeferredClaim".to_string(), - ty: DeclarationId(2164), + ty: DeclarationId(2166), }, Field { label: "BridgeLedgerZero".to_string(), - ty: DeclarationId(2165), ->>>>>>> origin/main + ty: DeclarationId(2167), }, ], }, @@ -32529,11 +28948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1057), name: Some("ProgramInput".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32547,20 +28962,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1058), name: Some("ProgramOutputBind".to_string()), connective: TypeConnective::Conj { children: vec![Field { label: "output_ref".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }], }, type_params: vec![], @@ -32574,11 +28981,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1059), name: Some("TestClaim".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -32596,19 +28999,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(2168), }, ], }, @@ -32623,11 +29018,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1060), name: Some("TestSuite".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -32637,11 +29028,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(2169), }, ], }, @@ -32656,11 +29043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1061), name: Some("TestObligation".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -32670,11 +29053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(2170), }, ], }, @@ -32689,19 +29068,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1059)], + output: DeclarationId(2126), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14657, @@ -32719,19 +29090,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1059)], + output: DeclarationId(1061), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14731, @@ -32749,19 +29112,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(2127)], + output: DeclarationId(2128), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/std/verification.dag", 14899, @@ -32779,21 +29134,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, type_params: vec![], phantom_params: Vec::new(), @@ -32806,11 +29152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1066), name: Some("ValueBehavior".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32824,11 +29166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1067), name: Some("Transform".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32842,11 +29180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1068), name: Some("Branch".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32860,11 +29194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1069), name: Some("Loop".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32878,11 +29208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1070), name: Some("Bind".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32896,11 +29222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1071), name: Some("Main".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32914,11 +29236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1072), name: Some("DeclarationRef".to_string()), connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -32932,11 +29250,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1073), name: Some("go_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -32952,22 +29266,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1855), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1857), -======= - constructor: DeclarationId(1856), ->>>>>>> origin/main + constructor: DeclarationId(1858), payload: vec![], }, ), @@ -32978,11 +29284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1074), name: Some("go_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(859), @@ -33012,11 +29314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1075), name: Some("go_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(861), @@ -33037,11 +29335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1076), name: Some("go_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33056,11 +29350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33083,11 +29373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1077), name: Some("go_int32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33102,11 +29388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33129,11 +29411,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1078), name: Some("go_integer_inhabit_i32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -33148,7 +29426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33289,11 +29506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1080), name: Some("go_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33308,11 +29521,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33335,11 +29544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1081), name: Some("go_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33354,11 +29559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33381,11 +29582,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1082), name: Some("go_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33400,11 +29597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33427,11 +29620,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1083), name: Some("go_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33446,11 +29635,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33473,11 +29658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1084), name: Some("go_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33492,11 +29673,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33519,11 +29696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1085), name: Some("go_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33538,11 +29711,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33566,11 +29735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -33590,11 +29755,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1086), name: Some("go_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33609,11 +29770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33636,11 +29793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1087), name: Some("go_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33655,11 +29808,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33684,11 +29833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -33707,11 +29852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "state".to_string(), ))], @@ -33732,11 +29873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -33757,11 +29894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1088), name: Some("go_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33776,11 +29909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33805,11 +29934,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -33828,11 +29953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -33851,11 +29972,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -33876,11 +29993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1089), name: Some("go_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33895,11 +30008,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33922,11 +30031,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1090), name: Some("go_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33941,11 +30046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -33968,11 +30069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1091), name: Some("go_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -33987,11 +30084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34014,11 +30107,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1092), name: Some("go_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34033,11 +30122,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34060,11 +30145,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1093), name: Some("go_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34079,11 +30160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34108,11 +30185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1094), name: Some("go_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34127,11 +30200,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34154,11 +30223,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1095), name: Some("go_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34173,11 +30238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34202,11 +30263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -34225,11 +30282,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -34250,11 +30303,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1096), name: Some("go_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34269,11 +30318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34300,11 +30345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -34323,11 +30364,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -34348,11 +30385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1097), name: Some("go_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34367,11 +30400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34398,11 +30427,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -34421,11 +30446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -34446,11 +30467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1098), name: Some("go_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34465,11 +30482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34495,11 +30508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -34519,11 +30528,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1099), name: Some("go_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34538,11 +30543,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34567,11 +30568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -34590,11 +30587,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -34615,11 +30608,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1100), name: Some("go_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34634,11 +30623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34663,11 +30648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -34686,11 +30667,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -34711,11 +30688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1101), name: Some("go_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34730,11 +30703,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34759,11 +30728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -34782,11 +30747,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -34805,11 +30766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -34830,11 +30787,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1102), name: Some("go_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34849,11 +30802,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34878,11 +30827,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -34901,11 +30846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -34926,11 +30867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1103), name: Some("go_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -34945,11 +30882,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -34973,11 +30906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -34997,11 +30926,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1104), name: Some("go_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35016,11 +30941,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35044,11 +30965,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -35068,11 +30985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1105), name: Some("go_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35087,11 +31000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35115,11 +31024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -35139,11 +31044,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1106), name: Some("go_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35158,11 +31059,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35187,11 +31084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -35212,11 +31105,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -35237,11 +31126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1107), name: Some("go_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35256,11 +31141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35283,11 +31164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1108), name: Some("go_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35302,11 +31179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35329,11 +31202,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1109), name: Some("go_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35348,11 +31217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35375,11 +31240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1110), name: Some("go_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35394,11 +31255,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35421,11 +31278,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1111), name: Some("go_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35440,11 +31293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35469,11 +31318,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -35492,11 +31337,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -35517,11 +31358,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -35542,11 +31379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -35567,11 +31400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -35592,11 +31421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -35617,11 +31442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -35642,11 +31463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -35667,11 +31484,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -35690,11 +31503,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -35715,11 +31524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1112), name: Some("go_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35734,11 +31539,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35761,11 +31562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1113), name: Some("go_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35780,11 +31577,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35807,11 +31600,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1114), name: Some("go_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35826,11 +31615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35853,11 +31638,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1115), name: Some("go_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35872,11 +31653,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35899,11 +31676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1116), name: Some("go_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35918,11 +31691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35945,11 +31714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1117), name: Some("go_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -35964,11 +31729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -35991,11 +31752,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1118), name: Some("go_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36010,11 +31767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -36041,11 +31794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -36066,11 +31815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -36091,11 +31836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1119), name: Some("go_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36110,11 +31851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -36139,11 +31876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -36164,11 +31897,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -36187,11 +31916,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -36210,11 +31935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -36235,11 +31956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1120), name: Some("go_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36254,11 +31971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -36281,11 +31994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1121), name: Some("go_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36300,11 +32009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -36329,11 +32034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -36352,11 +32053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "payload".to_string(), ))], @@ -36377,11 +32074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -36400,11 +32093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -36425,11 +32114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1122), name: Some("go_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36444,11 +32129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -36473,11 +32154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -36496,11 +32173,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -36519,11 +32192,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -36544,11 +32213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -36567,11 +32232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -36592,11 +32253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1123), name: Some("go_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36611,11 +32268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -36640,11 +32293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -36663,11 +32312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -36686,11 +32331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -36711,11 +32352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -36734,11 +32371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -36759,11 +32392,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -36784,11 +32413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1124), name: Some("go_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -36803,11 +32428,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -36832,11 +32453,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -36855,11 +32472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -36878,11 +32491,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -36901,11 +32510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -36924,11 +32529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -36949,11 +32550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -36972,11 +32569,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -36997,11 +32590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1125), name: Some("go_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37016,11 +32605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37045,11 +32630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -37068,11 +32649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -37093,11 +32670,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -37116,11 +32689,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -37139,11 +32708,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -37164,11 +32729,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -37189,11 +32750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1126), name: Some("go_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37208,11 +32765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37235,11 +32788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1127), name: Some("go_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37254,11 +32803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37285,11 +32830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -37308,11 +32849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -37331,11 +32868,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -37356,11 +32889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -37381,11 +32910,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1128), name: Some("go_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37406,11 +32931,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1129), name: Some("go_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37431,11 +32952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1130), name: Some("go_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37456,11 +32973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1131), name: Some("go_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37481,11 +32994,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1132), name: Some("go_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37506,11 +33015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1133), name: Some("go_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37531,11 +33036,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1134), name: Some("go_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37556,11 +33057,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1135), name: Some("go_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37581,11 +33078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1136), name: Some("go_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37606,11 +33099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1137), name: Some("go_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37631,11 +33120,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1138), name: Some("go_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37656,11 +33141,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1139), name: Some("go_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37681,11 +33162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1140), name: Some("go_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37706,11 +33183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1141), name: Some("go_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -37731,11 +33204,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1142), name: Some("go_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -37750,11 +33219,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37773,11 +33238,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1143), name: Some("go_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -37792,11 +33253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37815,11 +33272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1144), name: Some("go_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -37834,11 +33287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37857,11 +33306,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1145), name: Some("go_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -37876,11 +33321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37901,11 +33342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1146), name: Some("go_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -37920,11 +33357,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37943,11 +33376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1147), name: Some("go_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -37962,11 +33391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -37985,11 +33410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1148), name: Some("go_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38004,11 +33425,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38027,11 +33444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1149), name: Some("go_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38046,11 +33459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38069,11 +33478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1150), name: Some("go_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38088,11 +33493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38111,11 +33512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1151), name: Some("go_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38130,11 +33527,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38153,11 +33546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1152), name: Some("go_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38172,11 +33561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38195,11 +33580,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1153), name: Some("go_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38214,11 +33595,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38237,11 +33614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1154), name: Some("go_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38256,11 +33629,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38279,11 +33648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1155), name: Some("go_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38298,11 +33663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38321,11 +33682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1156), name: Some("go_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38340,11 +33697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38363,11 +33716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1157), name: Some("go_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38382,11 +33731,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38405,11 +33750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1158), name: Some("go_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38424,11 +33765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38447,11 +33784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1159), name: Some("go_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -38466,11 +33799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38489,11 +33818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1160), name: Some("go_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -38508,19 +33833,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1070)), ), ( "carrier".to_string(), @@ -38536,11 +33853,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1161), name: Some("go_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -38555,19 +33868,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1068)), ), ( "carrier".to_string(), @@ -38583,11 +33888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1162), name: Some("go_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -38602,19 +33903,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1071)), ), ( "carrier".to_string(), @@ -38630,11 +33923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1163), name: Some("go_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -38649,11 +33938,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38662,11 +33947,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1928), payload: vec![], }, ), @@ -38679,11 +33960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1164), name: Some("go_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -38698,11 +33975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -38711,10 +33984,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> origin/main + constructor: DeclarationId(1932), payload: vec![], }, ), @@ -38908,188 +34177,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1168), name: Some("go_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -39104,11 +34195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -39126,11 +34213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1169), name: Some("go_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -39145,11 +34228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -39169,11 +34248,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1170), name: Some("go_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -39188,11 +34263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -39210,11 +34281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1171), name: Some("go_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -39229,11 +34296,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -39242,11 +34305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -39257,11 +34316,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -39275,11 +34330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1172), name: Some("go_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -39294,11 +34345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -39307,9 +34354,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> origin/main - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -39393,11 +34437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -39407,25 +34447,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - payload: vec![], - }, - ), - ]), ]), ), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), @@ -39433,19 +34459,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -39459,24 +34477,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -39488,11 +34498,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -39502,11 +34508,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -39518,113 +34520,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(904)), -======= meta_tag: Some(DeclarationId(905)), ->>>>>>> origin/main - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1188)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(623)), -======= - FieldValue::Reference(DeclarationId(1187)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(638)), ->>>>>>> origin/main - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1935), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1917), -======= - constructor: DeclarationId(1916), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1917), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/go.dag", 27169, 27392), - }); - declarations.push(Declaration { - id: DeclarationId(1174), - name: Some("go_contains_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1188)), + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -39633,7 +34547,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -39673,11 +34584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1176), name: Some("go_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(914), @@ -39692,11 +34599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1189)), ), ( "target".to_string(), @@ -39705,29 +34608,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1939), payload: vec![], }, ), ( "empty_variant".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1489)), - ), - ( - "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1491)), -======= - FieldValue::Reference(DeclarationId(1488)), + FieldValue::Reference(DeclarationId(1490)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1490)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1492)), ), ( "scrutinee".to_string(), @@ -39757,11 +34648,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1177), name: Some("go_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -39791,11 +34678,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1178), name: Some("go_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -39829,11 +34712,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1179), name: Some("go_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -39878,11 +34757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1180), name: Some("go_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -39914,11 +34789,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1181), name: Some("go_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -39940,11 +34811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1182), name: Some("go_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -39990,11 +34857,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1183), name: Some("go_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -40016,11 +34879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1184), name: Some("go_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -40064,11 +34923,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1185), name: Some("go_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(926), @@ -40122,11 +34977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1186), name: Some("go_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), @@ -40200,11 +35051,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1187), name: Some("go_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -40248,11 +35095,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1188), name: Some("go_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -40280,11 +35123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1189), name: Some("go_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(932), @@ -40299,99 +35138,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1187)), ), ], }), @@ -40400,11 +35191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1190), name: Some("go_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(831), @@ -40440,11 +35227,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1191), name: Some("go_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(822), @@ -40460,87 +35243,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1791), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1793), -======= - constructor: DeclarationId(1792), ->>>>>>> origin/main + constructor: DeclarationId(1794), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1799), -======= - constructor: DeclarationId(1798), ->>>>>>> origin/main + constructor: DeclarationId(1800), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1803), -======= - constructor: DeclarationId(1802), ->>>>>>> origin/main + constructor: DeclarationId(1804), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1805), -======= - constructor: DeclarationId(1804), ->>>>>>> origin/main + constructor: DeclarationId(1806), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1809), -======= - constructor: DeclarationId(1808), ->>>>>>> origin/main + constructor: DeclarationId(1810), payload: vec![], }, ), ( "correction_style".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1189)), -======= - FieldValue::Reference(DeclarationId(1188)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1190)), ), ( "post_emit_verifier".to_string(), @@ -40566,11 +35317,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1813), payload: vec![], }, ), @@ -40583,11 +35330,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1192), name: Some("go_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(823), @@ -40602,19 +35345,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1191)), ), ], }), @@ -40623,11 +35358,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1193), name: Some("python_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -40655,11 +35386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1194), name: Some("python_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -40693,11 +35420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1195), name: Some("python_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -40742,11 +35465,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1196), name: Some("python_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -40778,11 +35497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1197), name: Some("python_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -40804,11 +35519,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1198), name: Some("python_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -40854,11 +35565,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1199), name: Some("python_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -40882,11 +35589,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1200), name: Some("python_type_definitions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -40934,11 +35637,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1201), name: Some("python_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(926), @@ -40992,11 +35691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1202), name: Some("python_collections".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), @@ -41062,11 +35757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1203), name: Some("python_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -41106,11 +35797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1204), name: Some("python_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -41138,11 +35825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1205), name: Some("python_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(932), @@ -41157,99 +35840,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1203)), ), ], }), @@ -41258,11 +35893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1206), name: Some("python_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -41278,22 +35909,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1855), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1857), -======= - constructor: DeclarationId(1856), ->>>>>>> origin/main + constructor: DeclarationId(1858), payload: vec![], }, ), @@ -41304,11 +35927,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1207), name: Some("python_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(859), @@ -41336,11 +35955,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1208), name: Some("python_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(861), @@ -41361,11 +35976,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1209), name: Some("python_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41380,11 +35991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41407,11 +36014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1210), name: Some("python_integer_inhabit_at_i32_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -41426,11 +36029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "kernel_integer".to_string(), @@ -41443,27 +36042,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1581), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -41475,11 +36062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1209)), ), ], }), @@ -41488,11 +36071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1211), name: Some("python_integer_inhabit_unbounded_decl".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -41507,7 +36086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41626,11 +36155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1213), name: Some("python_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41645,11 +36170,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41672,11 +36193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1214), name: Some("python_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41691,11 +36208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41718,11 +36231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1215), name: Some("python_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41737,11 +36246,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41764,11 +36269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1216), name: Some("python_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41783,11 +36284,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41810,11 +36307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1217), name: Some("python_declaration_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41829,19 +36322,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1072)), ), ( "carrier".to_string(), @@ -41860,11 +36345,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1218), name: Some("python_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41879,11 +36360,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41906,11 +36383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1219), name: Some("python_dag_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41925,11 +36398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41952,11 +36421,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1220), name: Some("python_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -41971,11 +36436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -41998,11 +36459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1221), name: Some("python_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42017,11 +36474,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42044,11 +36497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1222), name: Some("python_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42063,11 +36512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42090,11 +36535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1223), name: Some("python_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42109,11 +36550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42136,11 +36573,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1224), name: Some("python_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42155,11 +36588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42182,11 +36611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1225), name: Some("python_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42201,11 +36626,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42228,11 +36649,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1226), name: Some("python_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42247,11 +36664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42274,11 +36687,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1227), name: Some("python_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42293,11 +36702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42320,11 +36725,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1228), name: Some("python_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42345,11 +36746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1229), name: Some("python_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42370,11 +36767,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1230), name: Some("python_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42395,11 +36788,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1231), name: Some("python_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42420,11 +36809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1232), name: Some("python_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42445,11 +36830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1233), name: Some("python_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42470,11 +36851,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1234), name: Some("python_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42495,11 +36872,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1235), name: Some("python_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42520,11 +36893,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1236), name: Some("python_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42545,11 +36914,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1237), name: Some("python_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42570,11 +36935,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1238), name: Some("python_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42595,11 +36956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1239), name: Some("python_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42620,11 +36977,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1240), name: Some("python_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42645,11 +36998,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1241), name: Some("python_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -42670,11 +37019,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1242), name: Some("python_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42689,11 +37034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42712,11 +37053,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1243), name: Some("python_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42731,11 +37068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42754,11 +37087,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1244), name: Some("python_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42773,11 +37102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42796,11 +37121,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1245), name: Some("python_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42815,11 +37136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42840,11 +37157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1246), name: Some("python_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42859,11 +37172,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42882,11 +37191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1247), name: Some("python_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42901,11 +37206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42924,11 +37225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1248), name: Some("python_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42943,11 +37240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -42966,11 +37259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1249), name: Some("python_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -42985,11 +37274,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43008,11 +37293,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1250), name: Some("python_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -43027,11 +37308,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43050,11 +37327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1251), name: Some("python_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -43069,11 +37342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43092,11 +37361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1252), name: Some("python_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -43111,11 +37376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43134,11 +37395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1253), name: Some("python_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -43153,11 +37410,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43176,11 +37429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1254), name: Some("python_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -43195,11 +37444,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43218,11 +37463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1255), name: Some("python_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -43237,11 +37478,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43260,11 +37497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1256), name: Some("python_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -43279,11 +37512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43302,11 +37531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1257), name: Some("python_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -43321,11 +37546,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43334,11 +37555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1928), payload: vec![], }, ), @@ -43351,11 +37568,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1258), name: Some("python_singleton_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -43370,11 +37583,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43383,10 +37592,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> origin/main + constructor: DeclarationId(1932), payload: vec![], }, ), @@ -43580,188 +37785,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1262), name: Some("python_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -43776,11 +37803,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43789,11 +37812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -43804,11 +37823,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -43822,11 +37837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1263), name: Some("python_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -43841,11 +37852,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -43854,9 +37861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> origin/main - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -43940,11 +37944,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -43954,25 +37954,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - payload: vec![], - }, - ), - ]), ]), ), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), @@ -43980,19 +37966,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -44006,24 +37984,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -44035,11 +38005,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -44049,11 +38015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -44065,122 +38027,34 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(904)), -======= meta_tag: Some(DeclarationId(905)), ->>>>>>> origin/main specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1204)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(623)), -======= - FieldValue::Reference(DeclarationId(1203)), + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), FieldValue::Reference(DeclarationId(638)), ->>>>>>> origin/main ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1935), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1917), -======= - constructor: DeclarationId(1916), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1917), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/python.dag", 16955, 17186), - }); - declarations.push(Declaration { - id: DeclarationId(1265), - name: Some("python_contains_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), - FieldValue::Reference(DeclarationId(1204)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(638)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1936), + constructor: DeclarationId(1937), payload: vec![], }, ), @@ -44192,7 +38066,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -44220,11 +38091,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1267), name: Some("python_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -44239,11 +38106,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -44260,15 +38123,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1269), name: Some("python_non_empty_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -44283,11 +38140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -44307,11 +38160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1270), name: Some("python_non_singleton_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -44326,11 +38175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -44350,11 +38195,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1271), name: Some("python_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(914), @@ -44369,11 +38210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1205)), ), ( "target".to_string(), @@ -44382,29 +38219,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1939), payload: vec![], }, ), ( "empty_variant".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1489)), - ), - ( - "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1491)), -======= - FieldValue::Reference(DeclarationId(1488)), + FieldValue::Reference(DeclarationId(1490)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1490)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1492)), ), ( "scrutinee".to_string(), @@ -44434,11 +38259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1272), name: Some("python_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(831), @@ -44474,11 +38295,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1273), name: Some("python_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(822), @@ -44494,87 +38311,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1791), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1795), -======= - constructor: DeclarationId(1794), ->>>>>>> origin/main + constructor: DeclarationId(1796), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1796), -======= - constructor: DeclarationId(1795), ->>>>>>> origin/main + constructor: DeclarationId(1797), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1799), -======= - constructor: DeclarationId(1798), ->>>>>>> origin/main + constructor: DeclarationId(1800), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1803), -======= - constructor: DeclarationId(1802), ->>>>>>> origin/main + constructor: DeclarationId(1804), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1804), -======= - constructor: DeclarationId(1803), ->>>>>>> origin/main + constructor: DeclarationId(1805), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1809), -======= - constructor: DeclarationId(1808), ->>>>>>> origin/main + constructor: DeclarationId(1810), payload: vec![], }, ), ( "correction_style".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1271)), -======= - FieldValue::Reference(DeclarationId(1270)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1272)), ), ( "post_emit_verifier".to_string(), @@ -44603,11 +38388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1812), payload: vec![], }, ), @@ -44620,11 +38401,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1274), name: Some("python_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(823), @@ -44639,19 +38416,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1273)), ), ], }), @@ -44660,11 +38429,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1275), name: Some("rust_execution_model".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(857), @@ -44680,22 +38445,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1857), payload: vec![], }, ), ( "scope".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1857), -======= - constructor: DeclarationId(1856), ->>>>>>> origin/main + constructor: DeclarationId(1858), payload: vec![], }, ), @@ -44706,11 +38463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1276), name: Some("rust_source_filtering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(859), @@ -44740,11 +38493,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1277), name: Some("rust_execution_requirement".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(861), @@ -44765,11 +38514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1278), name: Some("rust_int".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44784,11 +38529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -44811,11 +38552,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1279), name: Some("rust_uint8".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44830,11 +38567,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -44857,11 +38590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1280), name: Some("rust_i32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44876,11 +38605,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -44903,11 +38628,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1281), name: Some("rust_u32".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44922,11 +38643,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -44949,11 +38666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1282), name: Some("rust_i128".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -44968,11 +38681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -44995,11 +38704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1283), name: Some("rust_integer_inhabit_u32_at_program_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45014,11 +38719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "kernel_integer".to_string(), @@ -45031,26 +38732,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> origin/main + constructor: DeclarationId(1581), payload: vec![FieldValue::Literal(LiteralBits::Int( 4294967295, ))], @@ -45129,12 +38818,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(899), arguments: vec![], @@ -45148,11 +38833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "kernel_integer".to_string(), @@ -45165,78 +38846,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main payload: vec![], }, ), ( "type_realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1279)), -======= - FieldValue::Reference(DeclarationId(1278)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1280)), ), ], }), @@ -45245,11 +38861,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1286), name: Some("rust_integer_inhabit_int64_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45264,11 +38876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "kernel_integer".to_string(), @@ -45281,21 +38889,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1913), payload: vec![], }, ), ( "type_realization".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1277)), -======= - FieldValue::Reference(DeclarationId(1276)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1278)), ), ], }), @@ -45304,11 +38904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1287), name: Some("rust_integer_inhabit_i128_bound_unspecified".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(899), @@ -45323,7 +38919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45436,11 +38985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1289), name: Some("rust_string".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45455,11 +39000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45482,11 +39023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1290), name: Some("rust_node_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45501,11 +39038,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45528,11 +39061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1291), name: Some("rust_port_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45547,11 +39076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45574,11 +39099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1292), name: Some("rust_declaration_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45593,11 +39114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45620,11 +39137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1293), name: Some("rust_cluster_id".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45639,11 +39152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45666,11 +39175,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1294), name: Some("rust_type_shape".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45685,11 +39190,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45713,11 +39214,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "declaration".to_string(), ))], @@ -45737,11 +39234,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1295), name: Some("rust_port_state".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45756,11 +39249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45783,11 +39272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1296), name: Some("rust_port".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45802,11 +39287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45831,11 +39312,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -45854,11 +39331,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "state_value".to_string(), ))], @@ -45879,11 +39352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "produced_by".to_string(), ))], @@ -45904,11 +39373,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1297), name: Some("rust_source_span".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -45923,11 +39388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -45952,11 +39413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "file".to_string(), ))], @@ -45975,11 +39432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_start".to_string(), ))], @@ -45998,11 +39451,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "byte_end".to_string(), ))], @@ -46023,11 +39472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1298), name: Some("rust_literal_bits".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46042,11 +39487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46069,11 +39510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1299), name: Some("rust_atom_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46088,11 +39525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46115,11 +39548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1300), name: Some("rust_cardinality_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46134,11 +39563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46161,11 +39586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1301), name: Some("rust_interval".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46180,11 +39601,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46207,11 +39624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1302), name: Some("rust_positive_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46226,11 +39639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46255,11 +39664,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1303), name: Some("rust_interval_width".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46274,11 +39679,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46301,11 +39702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1304), name: Some("rust_conj_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46320,11 +39717,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46349,11 +39742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "label".to_string(), ))], @@ -46372,11 +39761,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "ty".to_string(), ))], @@ -46397,11 +39782,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1305), name: Some("rust_template_argument".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46416,11 +39797,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46447,11 +39824,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -46470,11 +39843,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "value".to_string(), ))], @@ -46495,11 +39864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1306), name: Some("rust_phantom_parameter".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46514,11 +39879,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46545,11 +39906,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "parameter".to_string(), ))], @@ -46568,11 +39925,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "algebra".to_string(), ))], @@ -46593,11 +39946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1307), name: Some("rust_nominal_opacity".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46612,11 +39961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46642,11 +39987,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "permitted_accessors".to_string(), ))], @@ -46666,11 +40007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1308), name: Some("rust_field_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46685,11 +40022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46716,11 +40049,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "0".to_string(), ))], @@ -46739,11 +40068,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "1".to_string(), ))], @@ -46764,11 +40089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1309), name: Some("rust_non_empty_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46783,11 +40104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46812,11 +40129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -46835,11 +40148,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -46860,11 +40169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1310), name: Some("rust_non_singleton_list".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46879,11 +40184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -46908,11 +40209,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "first".to_string(), ))], @@ -46931,11 +40228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "second".to_string(), ))], @@ -46954,11 +40247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "rest".to_string(), ))], @@ -46979,11 +40268,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1311), name: Some("rust_element_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -46998,11 +40283,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47026,11 +40307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "index_of".to_string(), ))], @@ -47050,11 +40327,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1312), name: Some("rust_param_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47069,11 +40342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47098,11 +40367,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "member_of".to_string(), ))], @@ -47121,11 +40386,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "slot_of".to_string(), ))], @@ -47146,11 +40407,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1313), name: Some("rust_transform_ref".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47165,11 +40422,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47193,11 +40446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "node_id".to_string(), ))], @@ -47217,11 +40466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1314), name: Some("rust_member_descent".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47236,11 +40481,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47264,11 +40505,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "param".to_string(), ))], @@ -47288,11 +40525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1315), name: Some("rust_intra_cluster_call".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47307,11 +40540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47335,11 +40564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "transform".to_string(), ))], @@ -47359,11 +40584,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1316), name: Some("rust_cluster".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47378,11 +40599,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47407,11 +40624,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "members".to_string(), ))], @@ -47432,11 +40645,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "intra_cluster_calls".to_string(), ))], @@ -47457,11 +40666,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1317), name: Some("rust_field_value".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47476,11 +40681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47503,11 +40704,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1318), name: Some("rust_value_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47522,11 +40719,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47549,11 +40742,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1319), name: Some("rust_arrow_body".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47568,11 +40757,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47595,11 +40780,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1320), name: Some("rust_type_connective".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47614,11 +40795,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47641,11 +40818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1321), name: Some("rust_declaration".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47660,11 +40833,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47689,11 +40858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -47712,11 +40877,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -47737,11 +40898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "connective".to_string(), ))], @@ -47762,11 +40919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "type_params".to_string(), ))], @@ -47787,11 +40940,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "phantom_params".to_string(), ))], @@ -47812,11 +40961,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "meta_tag".to_string(), ))], @@ -47837,11 +40982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "inhabits".to_string(), ))], @@ -47862,11 +41003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "value_body".to_string(), ))], @@ -47887,11 +41024,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "nominal_opacity".to_string(), ))], @@ -47910,11 +41043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -47935,11 +41064,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1322), name: Some("rust_arithmetic_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -47954,11 +41079,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -47981,11 +41102,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1323), name: Some("rust_comparison_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48000,11 +41117,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48027,11 +41140,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1324), name: Some("rust_logical_op".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48046,11 +41155,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48073,11 +41178,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1325), name: Some("rust_operator_kind".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48092,11 +41193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48119,11 +41216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1326), name: Some("rust_transform_target".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48138,11 +41231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48165,11 +41254,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1327), name: Some("rust_branch_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48184,11 +41269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48211,11 +41292,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1328), name: Some("rust_payload_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48230,11 +41307,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48261,11 +41334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "binding_name".to_string(), ))], @@ -48286,11 +41355,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "payload_port".to_string(), ))], @@ -48311,11 +41376,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1329), name: Some("rust_branch_path".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48330,11 +41391,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48359,11 +41416,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -48384,11 +41437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48407,11 +41456,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "pattern".to_string(), ))], @@ -48430,11 +41475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "binding".to_string(), ))], @@ -48455,11 +41496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1330), name: Some("rust_loop_bound".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48474,11 +41511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48501,11 +41534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1331), name: Some("rust_value_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48520,11 +41549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48549,11 +41574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48572,11 +41593,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "data".to_string(), ))], @@ -48597,11 +41614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48620,11 +41633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48645,11 +41654,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -48670,11 +41675,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1332), name: Some("rust_transform_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48689,11 +41690,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48718,11 +41715,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48741,11 +41734,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "target".to_string(), ))], @@ -48764,11 +41753,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "inputs".to_string(), ))], @@ -48789,11 +41774,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48812,11 +41793,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -48837,11 +41814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1333), name: Some("rust_branch_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -48856,11 +41829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -48885,11 +41854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -48908,11 +41873,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "input".to_string(), ))], @@ -48931,11 +41892,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "paths".to_string(), ))], @@ -48956,11 +41913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -48979,11 +41932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -49004,11 +41953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -49029,11 +41974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1334), name: Some("rust_loop_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49048,11 +41989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -49077,11 +42014,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -49100,11 +42033,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "source".to_string(), ))], @@ -49123,11 +42052,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "init".to_string(), ))], @@ -49146,11 +42071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "body".to_string(), ))], @@ -49169,11 +42090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "bound".to_string(), ))], @@ -49194,11 +42111,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -49217,11 +42130,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -49242,11 +42151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1335), name: Some("rust_bind_node".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49261,11 +42166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -49290,11 +42191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "id".to_string(), ))], @@ -49313,11 +42210,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "name".to_string(), ))], @@ -49338,11 +42231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "result_port".to_string(), ))], @@ -49361,11 +42250,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "params".to_string(), ))], @@ -49384,11 +42269,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1915), payload: vec![FieldValue::Literal(LiteralBits::String( "span".to_string(), ))], @@ -49409,11 +42290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "lane2_workflow".to_string(), ))], @@ -49434,11 +42311,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "emit_participation".to_string(), ))], @@ -49459,11 +42332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1336), name: Some("rust_behavior".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49478,11 +42347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -49505,11 +42370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1337), name: Some("rust_dag".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49524,11 +42385,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -49555,11 +42412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "declarations".to_string(), ))], @@ -49578,11 +42431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "nodes".to_string(), ))], @@ -49601,11 +42450,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "ports".to_string(), ))], @@ -49626,11 +42471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1916), payload: vec![FieldValue::Literal(LiteralBits::String( "clusters".to_string(), ))], @@ -49651,11 +42492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1338), name: Some("rust_surface_module".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49676,11 +42513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1339), name: Some("rust_surface_item".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49701,11 +42534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1340), name: Some("rust_surface_param".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49726,11 +42555,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1341), name: Some("rust_surface_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49751,11 +42576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1342), name: Some("rust_surface_variant".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49776,11 +42597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1343), name: Some("rust_variant_payload".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49801,11 +42618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1344), name: Some("rust_surface_type".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49826,11 +42639,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1345), name: Some("rust_surface_record_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49851,11 +42660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1346), name: Some("rust_surface_map_entry".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49876,11 +42681,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1347), name: Some("rust_surface_match_arm".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49901,11 +42702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1348), name: Some("rust_surface_pattern_field".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49926,11 +42723,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1349), name: Some("rust_surface_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49951,11 +42744,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1350), name: Some("rust_surface_literal".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -49976,11 +42765,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1351), name: Some("rust_surface_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -50001,11 +42786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1352), name: Some("rust_int_add".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50020,11 +42801,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50043,11 +42820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1353), name: Some("rust_int_sub".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50062,11 +42835,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50085,11 +42854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1354), name: Some("rust_int_mul".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50104,11 +42869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50127,11 +42888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1355), name: Some("rust_int_div".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50146,11 +42903,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50171,11 +42924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1356), name: Some("rust_int_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50190,11 +42939,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50213,11 +42958,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1357), name: Some("rust_node_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50232,11 +42973,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50255,11 +42992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1358), name: Some("rust_port_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50274,11 +43007,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50297,11 +43026,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1359), name: Some("rust_declaration_id_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50316,11 +43041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50339,11 +43060,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1360), name: Some("rust_string_eq".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50358,11 +43075,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50381,11 +43094,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1361), name: Some("rust_int_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50400,11 +43109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50423,11 +43128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1362), name: Some("rust_node_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50442,11 +43143,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50465,11 +43162,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1363), name: Some("rust_port_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50484,11 +43177,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50507,11 +43196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1364), name: Some("rust_declaration_id_ne".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50526,11 +43211,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50549,11 +43230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1365), name: Some("rust_int_lt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50568,11 +43245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50591,11 +43264,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1366), name: Some("rust_int_le".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50610,11 +43279,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50633,11 +43298,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1367), name: Some("rust_int_gt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50652,11 +43313,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50675,11 +43332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1368), name: Some("rust_int_ge".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50694,11 +43347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50717,11 +43366,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1369), name: Some("rust_bool_meet".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50736,11 +43381,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50759,11 +43400,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1370), name: Some("rust_bool_join".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(903), @@ -50778,11 +43415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -50801,11 +43434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1371), name: Some("rust_let_stmt".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -50820,19 +43449,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1070)), ), ( "carrier".to_string(), @@ -50848,11 +43469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1372), name: Some("rust_if_expr".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -50867,19 +43484,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1068)), ), ( "carrier".to_string(), @@ -50895,11 +43504,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1373), name: Some("rust_main_wrap".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(904), @@ -50907,214 +43512,36 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - ), - ( - "carrier".to_string(), - FieldValue::Literal(LiteralBits::String( - "fn main() { {body} println!({quote}{{}}{quote}, {final}); }" - .to_string(), - )), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1373), -======= - id: DeclarationId(1372), ->>>>>>> origin/main - name: Some("rust_empty_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(905), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(905)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1401)), -======= - FieldValue::Reference(DeclarationId(1400)), ->>>>>>> origin/main - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(606)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1927), -======= - constructor: DeclarationId(1926), ->>>>>>> origin/main - payload: vec![], - }, - ), - ("parameters".to_string(), FieldValue::List(vec![])), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 33894, 34036), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1374), -======= - id: DeclarationId(1373), ->>>>>>> origin/main - name: Some("rust_singleton_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(905), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(905)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1401)), -======= - FieldValue::Reference(DeclarationId(1400)), ->>>>>>> origin/main - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(610)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1928), -======= - constructor: DeclarationId(1927), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1917), - payload: vec![], - }, - ), - ])]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 34038, 34234), - }); - declarations.push(Declaration { - id: DeclarationId(1374), - name: Some("rust_cons_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(905), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(905)), + meta_tag: Some(DeclarationId(904)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1400)), + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), - FieldValue::Reference(DeclarationId(608)), - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1928), - payload: vec![], - }, + FieldValue::Reference(DeclarationId(1071)), ), ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1917), - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1917), - payload: vec![], - }, - ), - ]), - ]), + "carrier".to_string(), + FieldValue::Literal(LiteralBits::String( + "fn main() { {body} println!({quote}{{}}{quote}, {final}); }" + .to_string(), + )), ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), + ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(0))), ], }), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 34236, 34457), + span: SourceSpan::new("src/v3/spec/rust.dag", 32347, 32517), }); declarations.push(Declaration { - id: DeclarationId(1375), - name: Some("rust_concat_callable".to_string()), + id: DeclarationId(1374), + name: Some("rust_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -51128,54 +43555,30 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + constructor: DeclarationId(1929), payload: vec![], }, ), @@ -51210,7 +43612,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1379), name: Some("rust_list_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -51417,11 +43812,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -51439,11 +43830,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1380), name: Some("rust_result_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -51458,11 +43845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -51482,11 +43865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1381), name: Some("rust_lookup_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -51501,11 +43880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -51523,11 +43898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1382), name: Some("rust_map_instantiation".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(912), @@ -51542,11 +43913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -51566,11 +43933,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1383), name: Some("rust_is_empty_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -51585,11 +43948,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -51598,11 +43957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1933), payload: vec![], }, ), @@ -51613,11 +43968,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -51631,11 +43982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1384), name: Some("rust_fold_callable".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(905), @@ -51650,11 +43997,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -51663,9 +44006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec>>>>>> origin/main - constructor: DeclarationId(1933), + constructor: DeclarationId(1935), payload: vec![], }, ), @@ -51749,11 +44089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -51763,25 +44099,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - payload: vec![], - }, - ), - ]), ]), ), ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), @@ -51789,19 +44111,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(905), arguments: vec![], @@ -51815,24 +44129,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main ), ( "strategy".to_string(), FieldValue::Variant { - constructor: DeclarationId(1934), + constructor: DeclarationId(1936), payload: vec![], }, ), @@ -51844,11 +44150,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -51858,11 +44160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -51874,113 +44172,25 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(904)), -======= meta_tag: Some(DeclarationId(905)), ->>>>>>> origin/main - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "language".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1401)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(623)), -======= - FieldValue::Reference(DeclarationId(1400)), - ), - ( - "target".to_string(), - FieldValue::Reference(DeclarationId(638)), ->>>>>>> origin/main - ), - ( - "strategy".to_string(), - FieldValue::Variant { - constructor: DeclarationId(1935), - payload: vec![], - }, - ), - ( - "parameters".to_string(), - FieldValue::List(vec![ - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(0))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1917), -======= - constructor: DeclarationId(1916), ->>>>>>> origin/main - payload: vec![], - }, - ), - ]), - FieldValue::Record(vec![ - ("slot".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ( - "disposition".to_string(), - FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1917), - payload: vec![], - }, - ), - ]), - ]), - ), - ("cost".to_string(), FieldValue::Literal(LiteralBits::Int(1))), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/spec/rust.dag", 36453, 36680), - }); - declarations.push(Declaration { - id: DeclarationId(1386), - name: Some("rust_contains_callable".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(904), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(904)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![ ( "language".to_string(), - FieldValue::Reference(DeclarationId(1401)), + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -51989,7 +44199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + constructor: DeclarationId(1918), payload: vec![], }, ), @@ -52029,11 +44236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1388), name: Some("rust_list_pattern".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(914), @@ -52048,11 +44251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -52061,29 +44260,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1939), payload: vec![], }, ), ( "empty_variant".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1489)), - ), - ( - "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1491)), -======= - FieldValue::Reference(DeclarationId(1488)), + FieldValue::Reference(DeclarationId(1490)), ), ( "cons_variant".to_string(), - FieldValue::Reference(DeclarationId(1490)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1492)), ), ( "scrutinee".to_string(), @@ -52115,11 +44302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1389), name: Some("rust_statements".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(916), @@ -52151,11 +44334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1390), name: Some("rust_expressions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(917), @@ -52189,11 +44368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1391), name: Some("rust_control_flow".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(919), @@ -52238,11 +44413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1392), name: Some("rust_literals".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(920), @@ -52274,11 +44445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1393), name: Some("rust_modules".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(921), @@ -52300,11 +44467,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1394), name: Some("rust_functions".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(922), @@ -52350,11 +44513,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1395), name: Some("rust_type_applications".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(923), @@ -52376,11 +44535,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1396), name: Some("rust_type_defs".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(924), @@ -52426,11 +44581,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1397), name: Some("rust_record_derive_templates".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(925), @@ -52462,11 +44613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1398), name: Some("rust_patterns".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(926), @@ -52523,15 +44670,9 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); + declarations.push(Declaration { id: DeclarationId(1399), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(927)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); declarations.push(Declaration { - id: DeclarationId(1399), -======= - declarations.push(Declaration { id: DeclarationId(1397), name: Some("rust_collection_ops".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(927), arguments: vec![] }, type_params: vec![], phantom_params: Vec::new(), meta_tag: Some(DeclarationId(927)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { fields: vec![("concat".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __left = {left}; __left.extend({right}); __left }".to_string()))), ("length".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).len() as i64".to_string()))), ("is_empty".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).is_empty()".to_string()))), ("fold".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().fold({init}, {body})".to_string()))), ("map".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).iter().map({body}).collect::>()".to_string()))), ("filter".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __out = Vec::new(); for {item} in ({recv}).iter() { if {predicate} { __out.push({item_push}); } } __out }".to_string()))), ("contains".to_string(), FieldValue::Literal(LiteralBits::String("({recv}).contains({item})".to_string()))), ("empty_list".to_string(), FieldValue::Literal(LiteralBits::String("Vec::new()".to_string()))), ("list_literal".to_string(), FieldValue::Literal(LiteralBits::String("vec![{elements}]".to_string()))), ("cons".to_string(), FieldValue::Literal(LiteralBits::String("{ let mut __list = {tail}; __list.insert(0, {head}); __list }".to_string())))] }), refinement: None, nominal_opacity: None, span: SourceSpan::new("src/v3/spec/rust.dag", 39338, 39929) }); - declarations.push(Declaration { - id: DeclarationId(1398), ->>>>>>> origin/main + id: DeclarationId(1400), name: Some("rust_value_construction".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(928), @@ -52575,11 +44716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1401), name: Some("rust_rendering".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(929), @@ -52595,22 +44732,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1940), payload: vec![], }, ), ( "construct".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1941), -======= - constructor: DeclarationId(1940), ->>>>>>> origin/main + constructor: DeclarationId(1942), payload: vec![], }, ), @@ -52621,11 +44750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1402), name: Some("rust_language".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(932), @@ -52640,99 +44765,51 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1400)), ), ], }), @@ -52741,11 +44818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1403), name: Some("rust_correction_style".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(831), @@ -52781,11 +44854,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1404), name: Some("rust_clean_emission".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(822), @@ -52801,87 +44870,55 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1791), payload: vec![], }, ), ( "pattern_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1793), -======= - constructor: DeclarationId(1792), ->>>>>>> origin/main + constructor: DeclarationId(1794), payload: vec![], }, ), ( "variant_payload_field_access".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1797), -======= - constructor: DeclarationId(1796), ->>>>>>> origin/main + constructor: DeclarationId(1798), payload: vec![], }, ), ( "imports".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1799), -======= - constructor: DeclarationId(1798), ->>>>>>> origin/main + constructor: DeclarationId(1800), payload: vec![], }, ), ( "block_return".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1802), -======= - constructor: DeclarationId(1801), ->>>>>>> origin/main + constructor: DeclarationId(1803), payload: vec![], }, ), ( "variable_bindings".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1805), -======= - constructor: DeclarationId(1804), ->>>>>>> origin/main + constructor: DeclarationId(1806), payload: vec![], }, ), ( "match_arm_body".to_string(), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(1808), -======= - constructor: DeclarationId(1807), ->>>>>>> origin/main + constructor: DeclarationId(1809), payload: vec![], }, ), ( "correction_style".to_string(), -<<<<<<< HEAD - FieldValue::Reference(DeclarationId(1402)), -======= - FieldValue::Reference(DeclarationId(1401)), ->>>>>>> origin/main + FieldValue::Reference(DeclarationId(1403)), ), ( "post_emit_verifier".to_string(), @@ -52913,11 +44950,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(1812), payload: vec![], }, ), @@ -52930,11 +44963,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1405), name: Some("rust_clean_emission_binding".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(823), @@ -52949,19 +44978,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1404)), ), ], }), @@ -52970,11 +44991,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1406), name: Some("rust_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -52998,11 +45015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1407), name: Some("rust_node_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -53026,11 +45039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1408), name: Some("rust_resolve_producer_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -53054,11 +45063,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1409), name: Some("port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -53066,43 +45071,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53117,11 +45086,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ], }), @@ -53130,13 +45095,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(747), arguments: vec![], @@ -53158,10 +45118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ], }), @@ -53203,11 +45159,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1412), name: Some("rust_lane2_workflow_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -53231,11 +45183,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1413), name: Some("lane2_workflow_at_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -53254,19 +45202,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ], }), @@ -53275,11 +45215,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1414), name: Some("rust_workflow_root_port_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -53303,11 +45239,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1415), name: Some("workflow_root_port_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -53326,19 +45258,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ], }), @@ -53347,11 +45271,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1416), name: Some("rust_workflow_root".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(898), @@ -53366,11 +45286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ( "target".to_string(), @@ -53393,11 +45309,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1417), name: Some("rust_declaration_by_id_accessor".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(746), @@ -53421,11 +45333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1418), name: Some("declaration_by_id_binding_rust".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(747), @@ -53444,19 +45352,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + FieldValue::Reference(DeclarationId(1402)), ), ], }), @@ -53465,11 +45365,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1419), name: Some("CompilerHostRealization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -53488,37 +45384,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1420), name: Some("PipelineSnapshotKind".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "SnapshotSurface".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2171), - }, - Field { - label: "SnapshotDag".to_string(), ty: DeclarationId(2172), }, - Field { - label: "SnapshotText".to_string(), - ty: DeclarationId(2173), -======= - ty: DeclarationId(2170), - }, Field { label: "SnapshotDag".to_string(), - ty: DeclarationId(2171), ->>>>>>> origin/main + ty: DeclarationId(2173), }, Field { label: "SnapshotText".to_string(), - ty: DeclarationId(2172), + ty: DeclarationId(2174), }, ], }, @@ -53533,37 +45413,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1421), name: Some("PipelineStageBinding".to_string()), connective: TypeConnective::Conj { children: vec![ Field { label: "stage".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "realization".to_string(), - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "snapshot".to_string(), - ty: DeclarationId(1419), -======= - ty: DeclarationId(1070), - }, - Field { - label: "realization".to_string(), - ty: DeclarationId(1070), - }, - Field { - label: "snapshot".to_string(), - ty: DeclarationId(1418), ->>>>>>> origin/main + ty: DeclarationId(1420), }, ], }, @@ -53578,11 +45442,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1422), name: Some("parse_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -53592,11 +45452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1419)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53610,11 +45466,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1423), name: Some("lower_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -53624,11 +45476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1419)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53642,11 +45490,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1424), name: Some("infer_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -53656,11 +45500,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1419)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53674,11 +45514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1425), name: Some("compute_ownership_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -53688,11 +45524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1419)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53708,11 +45540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1426), name: Some("emit_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -53722,11 +45550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1419)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53740,11 +45564,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1427), name: Some("lens_complexity_realization".to_string()), connective: TypeConnective::Conj { children: vec![Field { @@ -53754,11 +45574,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + meta_tag: Some(DeclarationId(1419)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53774,110 +45590,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1420)), -======= - meta_tag: Some(DeclarationId(1419)), - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1432)), - ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1420)), - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2170), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), - }); - declarations.push(Declaration { - id: DeclarationId(1427), - name: Some("lower_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1419), - arguments: vec![], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(1419)), ->>>>>>> origin/main - specialization_parent: None, - inhabits: None, - value_body: Some(ValueBody::Structural { - fields: vec![ - ( - "stage".to_string(), - FieldValue::Reference(DeclarationId(1433)), - ), - ( - "realization".to_string(), - FieldValue::Reference(DeclarationId(1421)), - ), - ( - "snapshot".to_string(), - FieldValue::Variant { - constructor: DeclarationId(2171), - payload: vec![], - }, - ), - ], - }), - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1254, 1382), - }); - declarations.push(Declaration { - id: DeclarationId(1428), - name: Some("lower_stage_binding".to_string()), - connective: TypeConnective::Instantiation { - template: DeclarationId(1420), -======= - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 1384, 1508), - }); - declarations.push(Declaration { id: DeclarationId(1428), - name: Some("infer_stage_binding".to_string()), + name: Some("parse_stage_binding".to_string()), connective: TypeConnective::Instantiation { - template: DeclarationId(1419), ->>>>>>> origin/main + template: DeclarationId(1421), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1420)), -======= - meta_tag: Some(DeclarationId(1419)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1421)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53893,11 +45614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main payload: vec![], }, ), @@ -53905,32 +45622,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1421), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1420)), -======= - meta_tag: Some(DeclarationId(1419)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1421)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -53942,12 +45645,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main ), ( "snapshot".to_string(), FieldValue::Variant { - constructor: DeclarationId(2172), + constructor: DeclarationId(2173), payload: vec![], }, ), @@ -53992,18 +45692,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec>>>>>> origin/main + body: ArrowBody::ExternalRealization(DeclarationId(1422)), }, type_params: vec![], phantom_params: Vec::new(), @@ -54162,16 +45818,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(745)], - output: DeclarationId(745), - body: ArrowBody::ExternalRealization(DeclarationId(1423)), - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/compiler/pipeline.dag", 2142, 2184), - }); - declarations.push(Declaration { -<<<<<<< HEAD - id: DeclarationId(1435), - name: Some("infer".to_string()), - connective: TypeConnective::Arrow { - inputs: vec![DeclarationId(744)], - output: DeclarationId(744), - body: ArrowBody::ExternalRealization(DeclarationId(1423)), + body: ArrowBody::ExternalRealization(DeclarationId(1424)), }, type_params: vec![], phantom_params: Vec::new(), @@ -54240,12 +45854,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745)], output: DeclarationId(745), @@ -54262,12 +45872,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1439), name: Some("emit".to_string()), connective: TypeConnective::Arrow { inputs: vec![ @@ -54294,11 +45900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + body: ArrowBody::ExternalRealization(DeclarationId(1426)), }, type_params: vec![], phantom_params: Vec::new(), @@ -54311,11 +45913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1440), name: Some("compile".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(197), DeclarationId(197), DeclarationId(932)], @@ -54337,19 +45935,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(2175), body: ArrowBody::Unparsed(SourceSpan::new( "src/v3/compiler/operators.dag", 156, @@ -54367,11 +45957,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1442), name: Some("symbol".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(723)], @@ -54389,11 +45975,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1443), name: Some("algebra_field_name".to_string()), connective: TypeConnective::Arrow { inputs: vec![DeclarationId(723)], @@ -54411,11 +45993,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1444), name: Some("LensRegistryEntry".to_string()), connective: TypeConnective::Conj { children: vec![ @@ -54444,26 +46022,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54491,26 +46058,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54538,26 +46094,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54585,26 +46130,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54632,26 +46166,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54682,26 +46205,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54729,26 +46241,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54776,26 +46277,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54823,26 +46313,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + template: DeclarationId(1444), arguments: vec![], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(1443)), -======= - meta_tag: Some(DeclarationId(1442)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(1444)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::Structural { @@ -54870,29 +46349,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1454), name: Some("IntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "OrderedRingAlgebra".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2175), - }, - Field { - label: "SemiringAlgebra".to_string(), ty: DeclarationId(2176), -======= - ty: DeclarationId(2174), }, Field { label: "SemiringAlgebra".to_string(), - ty: DeclarationId(2175), ->>>>>>> origin/main + ty: DeclarationId(2177), }, ], }, @@ -54907,29 +46374,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1455), name: Some("NonIntegerAlgebra".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BooleanAlgebraAlgebra".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2177), - }, - Field { - label: "TerminalAlgebra".to_string(), ty: DeclarationId(2178), -======= - ty: DeclarationId(2176), }, Field { label: "TerminalAlgebra".to_string(), - ty: DeclarationId(2177), ->>>>>>> origin/main + ty: DeclarationId(2179), }, ], }, @@ -54944,69 +46399,37 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1456), name: Some("TargetCarrier".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "BitCarrier".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2179), - }, - Field { - label: "ByteCarrier".to_string(), ty: DeclarationId(2180), }, - Field { - label: "Word16Carrier".to_string(), - ty: DeclarationId(2181), - }, - Field { - label: "Word32Carrier".to_string(), - ty: DeclarationId(2182), - }, - Field { - label: "Word64Carrier".to_string(), - ty: DeclarationId(2183), - }, - Field { - label: "Word128Carrier".to_string(), - ty: DeclarationId(2184), - }, - Field { - label: "TerminalCarrier".to_string(), - ty: DeclarationId(2185), -======= - ty: DeclarationId(2178), - }, Field { label: "ByteCarrier".to_string(), - ty: DeclarationId(2179), + ty: DeclarationId(2181), }, Field { label: "Word16Carrier".to_string(), - ty: DeclarationId(2180), + ty: DeclarationId(2182), }, Field { label: "Word32Carrier".to_string(), - ty: DeclarationId(2181), + ty: DeclarationId(2183), }, Field { label: "Word64Carrier".to_string(), - ty: DeclarationId(2182), + ty: DeclarationId(2184), }, Field { label: "Word128Carrier".to_string(), - ty: DeclarationId(2183), + ty: DeclarationId(2185), }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2184), ->>>>>>> origin/main + ty: DeclarationId(2186), }, ], }, @@ -55021,37 +46444,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1457), name: Some("IntegerOverflow".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "TwoComplementWrap".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2186), - }, - Field { - label: "Saturating".to_string(), ty: DeclarationId(2187), }, - Field { - label: "Trap".to_string(), - ty: DeclarationId(2188), -======= - ty: DeclarationId(2185), - }, Field { label: "Saturating".to_string(), - ty: DeclarationId(2186), ->>>>>>> origin/main + ty: DeclarationId(2188), }, Field { label: "Trap".to_string(), - ty: DeclarationId(2187), + ty: DeclarationId(2189), }, ], }, @@ -55066,29 +46473,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1458), name: Some("RustPrimitive".to_string()), connective: TypeConnective::Disj { variants: vec![ Field { label: "IntegerPrimitive".to_string(), -<<<<<<< HEAD - ty: DeclarationId(2189), - }, - Field { - label: "NonIntegerPrimitive".to_string(), ty: DeclarationId(2190), -======= - ty: DeclarationId(2188), }, Field { label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2189), ->>>>>>> origin/main + ty: DeclarationId(2191), }, ], }, @@ -55103,209 +46498,117 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1459), name: Some("rust_pilot_primitives".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1457), -======= - value: DeclarationId(1456), ->>>>>>> origin/main + value: DeclarationId(1458), }], }, type_params: vec![], phantom_params: Vec::new(), -<<<<<<< HEAD - meta_tag: Some(DeclarationId(2191)), -======= - meta_tag: Some(DeclarationId(2190)), ->>>>>>> origin/main + meta_tag: Some(DeclarationId(2192)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2189), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2175), -======= - constructor: DeclarationId(2188), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2174), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2179), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("-128".to_string())), - FieldValue::Literal(LiteralBits::String("127".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2185), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2188), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2174), ->>>>>>> origin/main + constructor: DeclarationId(2176), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2180), + constructor: DeclarationId(2181), payload: vec![], }, -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2186), -======= - FieldValue::Literal(LiteralBits::String("-32768".to_string())), - FieldValue::Literal(LiteralBits::String("32767".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2185), ->>>>>>> origin/main + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2189), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2175), -======= - constructor: DeclarationId(2188), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i32".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2174), ->>>>>>> origin/main + constructor: DeclarationId(2176), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2181), + constructor: DeclarationId(2182), payload: vec![], }, -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2186), -======= - FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), - FieldValue::Literal(LiteralBits::String("2147483647".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2185), ->>>>>>> origin/main + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2189), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2175), -======= - constructor: DeclarationId(2188), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i64".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2174), ->>>>>>> origin/main + constructor: DeclarationId(2176), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2182), + constructor: DeclarationId(2183), payload: vec![], }, -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), FieldValue::Literal(LiteralBits::String("2147483647".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2186), + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2189), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("i64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2175), + constructor: DeclarationId(2176), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2183), + constructor: DeclarationId(2184), payload: vec![], }, -======= ->>>>>>> origin/main FieldValue::Literal(LiteralBits::String( "-9223372036854775808".to_string(), )), FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2186), -======= - constructor: DeclarationId(2185), ->>>>>>> origin/main + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2189), - payload: vec![ - FieldValue::Literal(LiteralBits::String("i128".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2175), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2184), -======= - constructor: DeclarationId(2188), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { - constructor: DeclarationId(2174), + constructor: DeclarationId(2176), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2183), ->>>>>>> origin/main + constructor: DeclarationId(2185), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -55316,216 +46619,122 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2189), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u8".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2176), -======= - constructor: DeclarationId(2188), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { - constructor: DeclarationId(2175), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2179), - payload: vec![], - }, - FieldValue::Literal(LiteralBits::String("0".to_string())), - FieldValue::Literal(LiteralBits::String("255".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2185), - payload: vec![], - }, - ], - }, - FieldValue::Variant { - constructor: DeclarationId(2188), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u16".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2175), ->>>>>>> origin/main + constructor: DeclarationId(2177), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2180), + constructor: DeclarationId(2181), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2186), -======= - FieldValue::Literal(LiteralBits::String("65535".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2185), ->>>>>>> origin/main + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2189), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { - constructor: DeclarationId(2176), -======= - constructor: DeclarationId(2188), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u32".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2175), ->>>>>>> origin/main + constructor: DeclarationId(2177), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2181), + constructor: DeclarationId(2182), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2186), -======= - FieldValue::Literal(LiteralBits::String("4294967295".to_string())), - FieldValue::Literal(LiteralBits::Bool(true)), - FieldValue::Variant { - constructor: DeclarationId(2185), ->>>>>>> origin/main + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2189), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { - constructor: DeclarationId(2176), -======= - constructor: DeclarationId(2188), - payload: vec![ - FieldValue::Literal(LiteralBits::String("u64".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2175), ->>>>>>> origin/main + constructor: DeclarationId(2177), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2182), + constructor: DeclarationId(2183), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -<<<<<<< HEAD FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2186), + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2189), + constructor: DeclarationId(2190), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { - constructor: DeclarationId(2176), + constructor: DeclarationId(2177), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2183), + constructor: DeclarationId(2184), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), -======= ->>>>>>> origin/main FieldValue::Literal(LiteralBits::String( "18446744073709551615".to_string(), )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2186), -======= - constructor: DeclarationId(2185), ->>>>>>> origin/main + constructor: DeclarationId(2187), payload: vec![], }, ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2190), - payload: vec![ - FieldValue::Literal(LiteralBits::String("bool".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2177), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2179), -======= - constructor: DeclarationId(2189), + constructor: DeclarationId(2191), payload: vec![ FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { - constructor: DeclarationId(2176), + constructor: DeclarationId(2178), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2178), ->>>>>>> origin/main + constructor: DeclarationId(2180), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { -<<<<<<< HEAD - constructor: DeclarationId(2190), + constructor: DeclarationId(2191), payload: vec![ FieldValue::Literal(LiteralBits::String("()".to_string())), FieldValue::Variant { - constructor: DeclarationId(2178), - payload: vec![], - }, - FieldValue::Variant { - constructor: DeclarationId(2185), -======= - constructor: DeclarationId(2189), - payload: vec![ - FieldValue::Literal(LiteralBits::String("()".to_string())), - FieldValue::Variant { - constructor: DeclarationId(2177), + constructor: DeclarationId(2179), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2184), ->>>>>>> origin/main + constructor: DeclarationId(2186), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -55537,11 +46746,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1460), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55561,11 +46766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1461), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55585,11 +46786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1462), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55609,11 +46806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1463), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55633,11 +46826,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1464), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55657,11 +46846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1465), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(614), DeclarationId(613)], @@ -55679,11 +46864,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1466), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55703,11 +46884,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1467), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(616), DeclarationId(617)], @@ -55725,30 +46902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - id: DeclarationId(1467), + id: DeclarationId(1468), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55765,14 +46919,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { - id: DeclarationId(1468), + id: DeclarationId(1469), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55789,11 +46939,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1471), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55839,11 +46982,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1472), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(621)], @@ -55861,11 +47000,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1473), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55885,11 +47020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1474), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55909,11 +47040,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1475), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(624)], @@ -55931,11 +47058,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1476), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55955,11 +47078,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1477), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -55979,11 +47098,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1478), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56003,19 +47118,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1478), body: ArrowBody::NoBody, }, type_params: vec![], @@ -56029,11 +47136,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1480), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56053,11 +47156,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1481), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56077,11 +47176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1482), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56101,11 +47196,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1483), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56125,11 +47216,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1484), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -56149,21 +47236,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1485), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1483), -======= - value: DeclarationId(1482), ->>>>>>> origin/main + value: DeclarationId(1484), }], }, type_params: vec![], @@ -56177,11 +47256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1486), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56201,11 +47276,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1487), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(632), @@ -56225,21 +47296,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1488), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1486), -======= - value: DeclarationId(1485), ->>>>>>> origin/main + value: DeclarationId(1487), }], }, type_params: vec![], @@ -56253,11 +47316,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1489), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56277,11 +47336,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1490), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56295,11 +47350,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1491), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56319,11 +47370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1492), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56333,11 +47380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1491), }, ], }, @@ -56352,11 +47395,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1493), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56376,11 +47415,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1494), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56400,11 +47435,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1495), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -56421,51 +47452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(730), @@ -56505,12 +47492,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + DeclarationId(1498), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -56546,11 +47529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1500), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56570,11 +47549,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1501), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(730), @@ -56594,17 +47569,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + DeclarationId(1501), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -56618,11 +47586,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1503), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56642,11 +47606,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1504), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(167), @@ -56663,11 +47623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1505), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -56684,11 +47640,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1506), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -56705,11 +47657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1507), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56729,11 +47677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1508), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56753,11 +47697,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1509), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56776,11 +47716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1510), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56799,31 +47735,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -56863,16 +47775,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1512), }], }, type_params: vec![], @@ -56886,11 +47794,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1514), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56915,11 +47819,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1515), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -56938,11 +47838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1516), name: None, connective: TypeConnective::Conj { children: vec![ @@ -56971,11 +47867,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1517), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -56989,30 +47881,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57050,7 +47919,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1521), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57087,11 +47952,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1522), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57110,11 +47971,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1523), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57133,11 +47990,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1524), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57151,11 +48004,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1525), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57174,11 +48023,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1526), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57197,11 +48042,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1527), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57220,11 +48061,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1528), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57244,20 +48081,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1529), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "fields".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1527), -======= - ty: DeclarationId(1526), ->>>>>>> origin/main + ty: DeclarationId(1528), }], }, type_params: vec![], @@ -57271,11 +48100,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1530), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57289,11 +48114,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1531), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57307,11 +48128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1532), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57330,11 +48147,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1533), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57353,11 +48166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1534), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57382,11 +48191,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1535), name: None, connective: TypeConnective::Conj { children: vec![ @@ -57423,11 +48228,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1536), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57441,11 +48242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1537), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(730), @@ -57465,20 +48262,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1538), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "first_breaker".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1536), -======= - ty: DeclarationId(1535), ->>>>>>> origin/main + ty: DeclarationId(1537), }], }, type_params: vec![], @@ -57492,11 +48281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1539), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -57516,20 +48301,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1540), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "ops".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1538), -======= - ty: DeclarationId(1537), ->>>>>>> origin/main + ty: DeclarationId(1539), }], }, type_params: vec![], @@ -57543,11 +48320,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1541), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -57567,20 +48340,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1542), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "arms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1540), -======= - ty: DeclarationId(1539), ->>>>>>> origin/main + ty: DeclarationId(1541), }], }, type_params: vec![], @@ -57594,11 +48359,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1543), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57617,11 +48378,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1544), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -57641,20 +48398,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1545), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "branches".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1543), -======= - ty: DeclarationId(1542), ->>>>>>> origin/main + ty: DeclarationId(1544), }], }, type_params: vec![], @@ -57668,11 +48417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1546), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57691,11 +48436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1547), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57714,11 +48455,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1548), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57732,11 +48469,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1549), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57750,11 +48483,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1550), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57768,11 +48497,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1551), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57786,11 +48511,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1552), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57804,11 +48525,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1553), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57827,11 +48544,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1554), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57850,11 +48563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1555), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -57868,30 +48577,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57929,7 +48615,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1559), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -57966,32 +48648,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(699), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, -<<<<<<< HEAD - span: SourceSpan::new("src/v3/std/substrate.dag", 18570, 18578), - }); - declarations.push(Declaration { id: DeclarationId(1560), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(743), + DeclarationId(699), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -58002,10 +48662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1561), @@ -58059,7 +48716,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1565), @@ -58140,7 +48773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1568), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58177,11 +48806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1569), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58195,11 +48820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1570), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(640), @@ -58216,11 +48837,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1571), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58239,11 +48856,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1572), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58262,11 +48875,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1573), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58285,11 +48894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1574), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58308,11 +48913,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1575), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58331,11 +48932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1576), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58354,11 +48951,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1577), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58377,11 +48970,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1578), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58400,11 +48989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1579), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58418,11 +49003,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1580), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58441,11 +49022,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1581), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58464,11 +49041,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1582), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58482,11 +49055,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1583), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58505,11 +49074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1584), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58534,11 +49099,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1585), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58552,11 +49113,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1586), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(704), @@ -58576,20 +49133,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1587), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1585), -======= - ty: DeclarationId(1584), ->>>>>>> origin/main + ty: DeclarationId(1586), }], }, type_params: vec![], @@ -58603,11 +49152,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1588), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58621,11 +49166,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1589), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58644,11 +49185,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1590), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58662,11 +49199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1591), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -58680,11 +49213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1592), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58703,11 +49232,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1593), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58726,11 +49251,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1594), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58750,20 +49271,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1595), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1593), -======= - ty: DeclarationId(1592), ->>>>>>> origin/main + ty: DeclarationId(1594), }], }, type_params: vec![], @@ -58777,11 +49290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1596), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58801,20 +49310,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1597), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1595), -======= - ty: DeclarationId(1594), ->>>>>>> origin/main + ty: DeclarationId(1596), }], }, type_params: vec![], @@ -58828,11 +49329,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1598), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58852,20 +49349,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1599), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1597), -======= - ty: DeclarationId(1596), ->>>>>>> origin/main + ty: DeclarationId(1598), }], }, type_params: vec![], @@ -58879,11 +49368,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1600), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -58903,11 +49388,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1601), name: None, connective: TypeConnective::Conj { children: vec![ @@ -58917,11 +49398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1600), }, ], }, @@ -58936,11 +49413,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1602), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -58959,50 +49432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59026,13 +49456,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }], }, type_params: vec![], @@ -59046,7 +49471,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1607), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -59108,11 +49529,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1608), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -59128,25 +49545,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1609), @@ -59177,7 +49576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1612), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -59216,51 +49611,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - }); - declarations.push(Declaration { - id: DeclarationId(1612), - name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "children".to_string(), - ty: DeclarationId(1611), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 9161, 9195), - }); declarations.push(Declaration { id: DeclarationId(1613), name: None, @@ -59279,24 +49631,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + span: SourceSpan::new("src/v3/std/substrate.dag", 9178, 9193), }); declarations.push(Declaration { id: DeclarationId(1614), name: None, connective: TypeConnective::Conj { children: vec![Field { -<<<<<<< HEAD label: "children".to_string(), - ty: DeclarationId(1612), -======= - label: "variants".to_string(), ty: DeclarationId(1613), ->>>>>>> origin/main }], }, type_params: vec![], @@ -59307,11 +49650,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1617), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59376,21 +49712,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1618), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "inputs".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1616), -======= - ty: DeclarationId(1615), ->>>>>>> origin/main + ty: DeclarationId(1617), }, Field { label: "output".to_string(), @@ -59413,11 +49741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1619), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59442,11 +49766,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1620), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59466,11 +49786,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1621), name: None, connective: TypeConnective::Conj { children: vec![ @@ -59480,11 +49796,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1620), }, ], }, @@ -59499,11 +49811,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1622), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -59520,11 +49828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1623), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59544,11 +49848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1624), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59565,28 +49865,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1625), @@ -59623,7 +49902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1628), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(719), @@ -59661,11 +49936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1629), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -59682,25 +49953,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1630), @@ -59914,70 +50167,6 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main ty: DeclarationId(722), }], }, @@ -59992,7 +50181,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1650), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60120,11 +50305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1651), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(726), @@ -60138,31 +50319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1652), @@ -60205,7 +50362,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1655), name: None, connective: TypeConnective::Conj { children: vec![ @@ -60250,140 +50403,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(1656), name: None, -<<<<<<< HEAD - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(641), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 14889, 14901), - }); - declarations.push(Declaration { - id: DeclarationId(1657), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15142, 15151), - }); - declarations.push(Declaration { - id: DeclarationId(1658), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(726), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15209, 15225), - }); - declarations.push(Declaration { - id: DeclarationId(1659), - name: None, - connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( - DeclarationId(738), - CardinalityBound::AtMostOne, - )), - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15289, 15313), - }); - declarations.push(Declaration { - id: DeclarationId(1660), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15727, 15739), - }); - declarations.push(Declaration { - id: DeclarationId(1661), - name: None, - connective: TypeConnective::Instantiation { - template: DeclarationId(604), - arguments: vec![TemplateArgument { - parameter: DeclarationId(605), - value: DeclarationId(641), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/substrate.dag", 15817, 15829), - }); - declarations.push(Declaration { - id: DeclarationId(1662), - name: None, -======= ->>>>>>> origin/main connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(673), CardinalityBound::AtMostOne, @@ -60399,7 +50423,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1673), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60717,11 +50737,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1674), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -60740,11 +50756,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1675), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -60758,11 +50770,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1676), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -60782,20 +50790,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1677), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "candidates".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1675), -======= - ty: DeclarationId(1674), ->>>>>>> origin/main + ty: DeclarationId(1676), }], }, type_params: vec![], @@ -60809,11 +50809,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1678), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -60833,11 +50829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1679), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -60857,11 +50849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1680), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -60881,11 +50869,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1681), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60905,11 +50889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1682), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -60929,11 +50909,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1683), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -60953,11 +50929,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1684), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -60977,11 +50949,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1685), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61001,11 +50969,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1686), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61025,11 +50989,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1687), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61049,11 +51009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1688), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61073,11 +51029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1689), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61097,11 +51049,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1690), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61121,11 +51069,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1691), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61145,11 +51089,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1692), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61169,11 +51109,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1693), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61193,11 +51129,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1694), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61217,11 +51149,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1695), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61241,11 +51169,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1696), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -61265,11 +51189,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1697), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61283,11 +51203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1698), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61301,11 +51217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1699), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61319,11 +51231,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1700), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61337,11 +51245,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1701), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61355,11 +51259,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1702), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61373,11 +51273,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1703), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61391,28 +51287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(758), @@ -61446,7 +51321,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1707), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -61481,11 +51352,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1708), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61504,11 +51371,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1709), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61527,11 +51390,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1710), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61550,11 +51409,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1711), name: None, connective: TypeConnective::Conj { children: vec![ @@ -61579,11 +51434,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1712), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -61603,20 +51454,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1713), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1711), -======= - ty: DeclarationId(1710), ->>>>>>> origin/main + ty: DeclarationId(1712), }], }, type_params: vec![], @@ -61630,11 +51473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1714), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(646), @@ -61654,20 +51493,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1715), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1713), -======= - ty: DeclarationId(1712), ->>>>>>> origin/main + ty: DeclarationId(1714), }], }, type_params: vec![], @@ -61681,11 +51512,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1716), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61704,11 +51531,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1717), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -61727,11 +51550,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1718), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -61751,11 +51570,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1719), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(647)], @@ -61773,11 +51588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1720), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(623), @@ -61787,13 +51598,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, ], }, @@ -61808,11 +51614,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1721), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(610), @@ -61832,11 +51634,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1722), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(763), DeclarationId(763)], @@ -61854,10 +51652,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1725), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), arguments: vec![ TemplateArgument { parameter: DeclarationId(614), -<<<<<<< HEAD - value: DeclarationId(762), -======= value: DeclarationId(764), }, TemplateArgument { - parameter: DeclarationId(1463), + parameter: DeclarationId(1465), value: DeclarationId(791), ->>>>>>> origin/main }, TemplateArgument { parameter: DeclarationId(613), value: DeclarationId(763), }, - TemplateArgument { - parameter: DeclarationId(1464), - value: DeclarationId(773), - }, ], }, type_params: vec![], @@ -61941,10 +51727,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main }, TemplateArgument { parameter: DeclarationId(613), @@ -62045,11 +51778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1728), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -62069,11 +51798,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1729), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -62093,11 +51818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1730), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -62117,11 +51838,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1731), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -62141,11 +51858,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1732), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -62165,11 +51878,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1733), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -62189,11 +51898,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1734), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -62213,11 +51918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1735), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(764), DeclarationId(763)], @@ -62235,11 +51936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1736), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), @@ -62253,13 +51950,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }, ], }, @@ -62274,11 +51966,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1737), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(608), @@ -62298,11 +51986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1738), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(606), @@ -62322,19 +52006,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + inputs: vec![DeclarationId(1696), DeclarationId(763)], + output: DeclarationId(1696), body: ArrowBody::NoBody, }, type_params: vec![], @@ -62348,35 +52024,22 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1740), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(612), arguments: vec![ TemplateArgument { parameter: DeclarationId(614), -<<<<<<< HEAD - value: DeclarationId(1695), -======= - value: DeclarationId(1694), ->>>>>>> origin/main + value: DeclarationId(1696), }, TemplateArgument { parameter: DeclarationId(613), value: DeclarationId(763), }, TemplateArgument { -<<<<<<< HEAD - parameter: DeclarationId(1464), - value: DeclarationId(793), -======= - parameter: DeclarationId(1463), + parameter: DeclarationId(1465), value: DeclarationId(794), ->>>>>>> origin/main }, ], }, @@ -62391,87 +52054,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { @@ -62490,15 +52074,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + value: DeclarationId(1018), }], }, type_params: vec![], @@ -62553,11 +52128,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1745), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62577,19 +52148,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1746), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "content".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1746), -======= - ty: DeclarationId(1743), + ty: DeclarationId(1745), }], }, type_params: vec![], @@ -62603,7 +52167,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + ty: DeclarationId(1747), }], }, type_params: vec![], @@ -62643,11 +52206,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1749), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62666,11 +52225,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1750), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(99), @@ -62687,11 +52242,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1751), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62705,11 +52256,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1750), }, ], }, @@ -62724,11 +52271,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1752), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -62747,11 +52290,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1753), name: None, connective: TypeConnective::Conj { children: vec![ @@ -62780,11 +52319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1754), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62798,11 +52333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1755), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62816,11 +52347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1756), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62834,11 +52361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1757), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62852,11 +52375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1758), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62870,11 +52389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1759), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62888,11 +52403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1760), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62906,11 +52417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1761), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -62930,11 +52437,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1762), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -62951,11 +52454,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1763), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62969,11 +52468,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1764), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -62987,11 +52482,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1765), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63005,11 +52496,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1766), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63023,11 +52510,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1767), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63041,11 +52524,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1768), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63059,11 +52538,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1769), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63088,11 +52563,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1770), name: None, connective: TypeConnective::Conj { children: vec![ @@ -63117,11 +52588,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1771), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63135,11 +52602,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1772), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63153,11 +52616,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1773), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63171,11 +52630,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1774), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63189,11 +52644,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1775), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63207,11 +52658,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1776), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63225,11 +52672,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1777), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63243,11 +52686,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1778), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63261,11 +52700,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1779), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63279,11 +52714,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1780), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63297,11 +52728,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1781), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(39), @@ -63321,11 +52748,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1782), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63339,11 +52762,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1783), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63357,11 +52776,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1784), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63375,11 +52790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1785), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63393,11 +52804,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1786), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63411,11 +52818,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1787), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63429,11 +52832,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1788), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63447,11 +52846,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1789), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63471,11 +52866,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1790), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63489,11 +52880,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1791), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63507,11 +52894,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1792), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63525,11 +52908,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1793), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63543,11 +52922,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1794), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63561,11 +52936,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1795), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63579,11 +52950,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1796), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63597,11 +52964,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1797), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63615,11 +52978,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1798), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63633,11 +52992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1799), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63651,11 +53006,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1800), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63669,11 +53020,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1801), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63687,11 +53034,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1802), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63705,11 +53048,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1803), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63723,11 +53062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1804), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63741,11 +53076,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1805), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63759,11 +53090,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1806), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63777,11 +53104,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1807), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63795,11 +53118,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1808), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63813,11 +53132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1809), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63831,11 +53146,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1810), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63849,11 +53160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1811), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -63873,11 +53180,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1812), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63891,11 +53194,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1813), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63909,11 +53208,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1814), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63927,11 +53222,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1815), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -63945,11 +53236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1816), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(197), @@ -63966,11 +53253,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1817), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -63987,11 +53270,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1818), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(846), @@ -64008,11 +53287,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1819), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(846), @@ -64029,11 +53304,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1820), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64052,11 +53323,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1821), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64075,11 +53342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1822), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64098,11 +53361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1823), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64121,11 +53380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1824), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64144,11 +53399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1825), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64162,20 +53413,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1826), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }], }, type_params: vec![], @@ -64189,11 +53432,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1827), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64207,11 +53446,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1828), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64230,21 +53465,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1829), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "amount".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }, Field { label: "collection".to_string(), @@ -64263,21 +53490,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1830), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }, Field { label: "ring_param".to_string(), @@ -64296,21 +53515,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1831), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "divisor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1027), -======= - ty: DeclarationId(1026), ->>>>>>> origin/main + ty: DeclarationId(1028), }, Field { label: "ring_param".to_string(), @@ -64329,11 +53540,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1832), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64352,11 +53559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1833), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64375,11 +53578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1834), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -64398,11 +53597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1835), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64416,11 +53611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1836), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64434,20 +53625,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1837), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }], }, type_params: vec![], @@ -64461,20 +53644,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1838), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1027), -======= - ty: DeclarationId(1026), ->>>>>>> origin/main + ty: DeclarationId(1028), }], }, type_params: vec![], @@ -64488,11 +53663,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1839), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64506,11 +53677,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1840), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64524,11 +53691,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1841), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64542,11 +53705,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1842), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(838), @@ -64563,11 +53722,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1843), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64581,11 +53736,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1844), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64599,11 +53750,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1845), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64617,11 +53764,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1846), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64635,11 +53778,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1847), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64653,11 +53792,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1848), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64671,11 +53806,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1849), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64689,11 +53820,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1850), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64707,11 +53834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1851), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64725,11 +53848,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1852), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64743,11 +53862,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1853), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64761,11 +53876,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1854), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64779,11 +53890,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1855), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64797,11 +53904,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1856), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64815,11 +53918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1857), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64833,11 +53932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1858), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64851,11 +53946,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1859), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -64869,31 +53960,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -65059,7 +54126,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1872), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65101,11 +54164,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1873), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -65125,11 +54184,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1874), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65148,11 +54203,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1875), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -65166,11 +54217,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1876), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -65190,11 +54237,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1877), name: None, connective: TypeConnective::Conj { children: vec![ @@ -65204,11 +54247,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1876), }, ], }, @@ -65223,11 +54262,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1878), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65246,11 +54281,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1879), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65269,11 +54300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1880), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -65287,11 +54314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1881), name: None, connective: TypeConnective::Conj { children: vec![ @@ -65320,11 +54343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1882), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -65344,10 +54363,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1885), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -65423,62 +54438,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -65583,16 +54490,16 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1891), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -65682,11 +54585,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1892), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -65712,11 +54611,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1893), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(37), @@ -65736,11 +54631,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1894), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -65766,11 +54657,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1895), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(876), @@ -65796,11 +54683,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1896), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65819,11 +54702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1897), name: None, connective: TypeConnective::Conj { children: vec![ @@ -65848,11 +54727,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1898), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -65866,11 +54741,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1899), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -65889,11 +54760,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1900), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -65913,21 +54780,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1901), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1899), -======= - value: DeclarationId(1898), ->>>>>>> origin/main + value: DeclarationId(1900), }], }, type_params: vec![], @@ -65941,11 +54800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1902), name: None, connective: TypeConnective::Conj { children: vec![ @@ -65959,11 +54814,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1901), }, ], }, @@ -65978,11 +54829,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1903), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -66002,11 +54849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1904), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -66026,21 +54869,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1905), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1903), -======= - value: DeclarationId(1902), ->>>>>>> origin/main + value: DeclarationId(1904), }], }, type_params: vec![], @@ -66054,11 +54889,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1906), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66068,19 +54899,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1905), }, ], }, @@ -66095,11 +54918,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1907), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -66119,19 +54938,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1907), body: ArrowBody::NoBody, }, type_params: vec![], @@ -66145,11 +54956,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1909), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(875), DeclarationId(875)], @@ -66167,11 +54974,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1910), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(744), DeclarationId(875)], @@ -66189,11 +54992,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1911), name: Some("DimensionUnitAbelianGroup".to_string()), connective: TypeConnective::Instantiation { template: DeclarationId(25), @@ -66213,11 +55012,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1912), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -66237,11 +55032,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1913), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66255,11 +55046,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1914), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66278,11 +55065,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1915), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66301,11 +55084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1916), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66324,11 +55103,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1917), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -66348,11 +55123,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1918), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66366,11 +55137,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1919), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66384,11 +55151,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1920), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66402,11 +55165,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1921), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66420,11 +55179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1922), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66438,11 +55193,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1923), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66456,11 +55207,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1924), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66474,11 +55221,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1925), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66492,11 +55235,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1926), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66510,11 +55249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1927), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66528,11 +55263,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1928), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66546,11 +55277,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1929), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66564,11 +55291,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1930), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66582,11 +55305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1931), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66600,11 +55319,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1932), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66618,11 +55333,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66636,11 +55347,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1934), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66654,11 +55361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66672,11 +55375,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66690,11 +55389,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1937), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66708,11 +55403,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1938), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66726,11 +55417,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1939), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66744,11 +55431,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1940), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66762,11 +55445,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1941), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66780,11 +55459,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1942), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66798,11 +55473,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1943), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66816,11 +55487,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1944), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66834,11 +55501,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1945), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -66852,11 +55515,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1946), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -66875,11 +55534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1947), name: None, connective: TypeConnective::Conj { children: vec![ @@ -66904,11 +55559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1948), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -66928,11 +55579,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1949), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(837), @@ -66949,11 +55596,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1950), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(840), @@ -66970,11 +55613,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1951), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -66994,28 +55633,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(81), @@ -67187,7 +55805,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + id: DeclarationId(1964), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67235,11 +55849,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1965), name: None, connective: TypeConnective::Conj { children: vec![ @@ -67264,11 +55874,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1966), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67282,11 +55888,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1967), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67300,11 +55902,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1968), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67318,20 +55916,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1969), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "degree".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }], }, type_params: vec![], @@ -67345,29 +55935,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1970), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "numerator".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), - }, - Field { - label: "root".to_string(), - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), + ty: DeclarationId(1027), }, Field { label: "root".to_string(), - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }, ], }, @@ -67382,29 +55960,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1971), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "base".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1027), - }, - Field { - label: "argument".to_string(), - ty: DeclarationId(1026), -======= - ty: DeclarationId(1026), + ty: DeclarationId(1028), }, Field { label: "argument".to_string(), - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }, ], }, @@ -67419,11 +55985,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1972), name: None, connective: TypeConnective::Conj { children: vec![ @@ -67448,11 +56010,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1973), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67471,11 +56029,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1974), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67489,11 +56043,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1975), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -67512,109 +56062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -67634,15 +56082,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main + id: DeclarationId(1980), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "terms".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1980), -======= - ty: DeclarationId(1977), + ty: DeclarationId(1979), }], }, type_params: vec![], @@ -67719,7 +56160,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec>>>>>> origin/main + ty: DeclarationId(1981), }], }, type_params: vec![], @@ -67759,11 +56199,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1983), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67777,11 +56213,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1984), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -67795,21 +56227,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1985), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1071), -======= - value: DeclarationId(1070), ->>>>>>> origin/main + value: DeclarationId(1072), }], }, type_params: vec![], @@ -67823,21 +56247,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1986), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1071), -======= - value: DeclarationId(1070), ->>>>>>> origin/main + value: DeclarationId(1072), }], }, type_params: vec![], @@ -67851,11 +56267,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1987), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(869), @@ -67875,19 +56287,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + output: DeclarationId(1987), body: ArrowBody::NoBody, }, type_params: vec![], @@ -67901,11 +56305,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1989), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(19), @@ -67925,11 +56325,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1990), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(996), DeclarationId(996)], @@ -67947,11 +56343,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1991), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(996), DeclarationId(735)], @@ -67969,11 +56361,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1992), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(745), DeclarationId(996)], @@ -67991,11 +56379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1993), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -68015,11 +56399,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1994), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(997), @@ -68039,11 +56419,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1995), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68057,11 +56433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1996), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68080,11 +56452,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1997), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -68108,11 +56476,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1998), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68131,11 +56495,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(1999), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -68155,20 +56515,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2000), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1998), -======= - ty: DeclarationId(1997), ->>>>>>> origin/main + ty: DeclarationId(1999), }], }, type_params: vec![], @@ -68182,11 +56534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2001), name: None, connective: TypeConnective::Conj { children: vec![ @@ -68211,11 +56559,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2002), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68234,11 +56578,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2003), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68257,11 +56597,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2004), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -68287,11 +56623,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2005), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -68311,16 +56643,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2006), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "input_order".to_string(), - ty: DeclarationId(1011), + ty: DeclarationId(1012), }], }, type_params: vec![], @@ -68334,11 +56662,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2007), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -68352,11 +56676,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2008), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -68376,11 +56696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2009), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -68391,11 +56707,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + value: DeclarationId(1015), }, ], }, @@ -68410,17 +56722,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + DeclarationId(1019), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -68434,17 +56739,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + DeclarationId(1019), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -68458,17 +56756,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + DeclarationId(1019), CardinalityBound::AtMostOne, )), type_params: vec![], @@ -68482,11 +56773,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2013), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -68497,11 +56784,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + value: DeclarationId(1019), }, ], }, @@ -68516,11 +56799,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2014), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(108), @@ -68531,11 +56810,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + value: DeclarationId(1019), }, ], }, @@ -68550,28 +56825,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(1027), @@ -68591,7 +56845,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main - id: DeclarationId(2019), + id: DeclarationId(2021), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68685,14 +56936,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { - id: DeclarationId(2020), + id: DeclarationId(2022), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68708,14 +56955,10 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { - id: DeclarationId(2021), + id: DeclarationId(2023), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68731,74 +56974,11 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main - }); - declarations.push(Declaration { - id: DeclarationId(2022), - name: None, -<<<<<<< HEAD - connective: TypeConnective::Conj { - children: vec![Field { - label: "param".to_string(), - ty: DeclarationId(197), -======= - connective: TypeConnective::Conj { - children: vec![Field { - label: "param".to_string(), - ty: DeclarationId(197), - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 3370, 3402), - }); - declarations.push(Declaration { - id: DeclarationId(2023), - name: None, - connective: TypeConnective::Conj { children: vec![] }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 4409, 4416), }); declarations.push(Declaration { id: DeclarationId(2024), name: None, - connective: TypeConnective::Conj { - children: vec![Field { - label: "previous".to_string(), - ty: DeclarationId(1025), ->>>>>>> origin/main - }], - }, - type_params: vec![], - phantom_params: Vec::new(), - meta_tag: None, - specialization_parent: None, - inhabits: None, - value_body: None, - refinement: None, - nominal_opacity: None, - span: SourceSpan::new("src/v3/std/termination.dag", 3334, 3365), - }); - declarations.push(Declaration { - id: DeclarationId(2023), - name: None, connective: TypeConnective::Conj { children: vec![Field { label: "param".to_string(), @@ -68835,7 +57015,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + ty: DeclarationId(1028), }], }, type_params: vec![], @@ -68886,11 +57062,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2029), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -68909,20 +57081,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2030), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "amount".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }], }, type_params: vec![], @@ -68936,20 +57100,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2031), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "steps".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1026), -======= - ty: DeclarationId(1025), ->>>>>>> origin/main + ty: DeclarationId(1027), }], }, type_params: vec![], @@ -68963,20 +57119,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2032), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "divisor".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1027), -======= - ty: DeclarationId(1026), ->>>>>>> origin/main + ty: DeclarationId(1028), }], }, type_params: vec![], @@ -68990,11 +57138,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2033), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69013,11 +57157,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2034), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -69036,11 +57176,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2035), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69054,21 +57190,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2036), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1025), -======= - value: DeclarationId(1024), ->>>>>>> origin/main + value: DeclarationId(1026), }], }, type_params: vec![], @@ -69082,21 +57210,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2037), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1018), -======= - value: DeclarationId(1017), ->>>>>>> origin/main + value: DeclarationId(1019), }], }, type_params: vec![], @@ -69110,11 +57230,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2038), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69128,11 +57244,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2039), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69146,11 +57258,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2040), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69164,11 +57272,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2041), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69182,11 +57286,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2042), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69200,11 +57300,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2043), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69218,11 +57314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2044), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69236,11 +57328,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2045), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69254,11 +57342,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2046), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69272,11 +57356,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2047), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69290,11 +57370,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2048), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69308,11 +57384,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2049), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69326,11 +57398,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2050), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69344,11 +57412,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2051), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -69362,49 +57426,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70441,7 +58463,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main - id: DeclarationId(2126), + id: DeclarationId(2127), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -70515,25 +58514,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main }); declarations.push(Declaration { id: DeclarationId(2128), @@ -70542,7 +58523,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main + id: DeclarationId(2138), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70705,11 +58682,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2139), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70723,11 +58696,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2140), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70741,11 +58710,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2141), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70759,11 +58724,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2142), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70777,11 +58738,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2143), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -70795,20 +58752,12 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2144), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1052), -======= - ty: DeclarationId(1051), ->>>>>>> origin/main + ty: DeclarationId(1053), }], }, type_params: vec![], @@ -70822,11 +58771,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2145), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70845,11 +58790,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2146), name: None, connective: TypeConnective::Conj { children: vec![ @@ -70859,11 +58800,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + ty: DeclarationId(1054), }, ], }, @@ -70878,11 +58815,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2147), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -70901,11 +58834,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2148), name: None, connective: TypeConnective::Conj { children: vec![ @@ -70934,37 +58863,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2149), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), - }, - Field { - label: "input_sample".to_string(), - ty: DeclarationId(1071), - }, - Field { - label: "expected_output".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), + ty: DeclarationId(1072), }, Field { label: "input_sample".to_string(), - ty: DeclarationId(1070), + ty: DeclarationId(1072), }, Field { label: "expected_output".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -70979,29 +58892,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2150), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), - }, - Field { - label: "invariant".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), + ty: DeclarationId(1072), }, Field { label: "invariant".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71016,60 +58917,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71138,7 +58986,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71208,37 +59044,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2156), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "subject_ref".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "oracle_ref".to_string(), - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "input_ref".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), - }, - Field { - label: "oracle_ref".to_string(), - ty: DeclarationId(1070), - }, - Field { - label: "input_ref".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71253,29 +59073,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2157), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "left_report_ref".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), - }, - Field { - label: "right_report_ref".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), + ty: DeclarationId(1072), }, Field { label: "right_report_ref".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71290,29 +59098,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2158), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "law".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1054), - }, - Field { - label: "lens_ref".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1053), + ty: DeclarationId(1055), }, Field { label: "lens_ref".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71327,29 +59123,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2159), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1043), -======= - ty: DeclarationId(1070), - }, - Field { - label: "list_constant".to_string(), - ty: DeclarationId(1042), ->>>>>>> origin/main + ty: DeclarationId(1044), }, Field { label: "bound".to_string(), @@ -71368,37 +59152,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2160), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "list_constant".to_string(), - ty: DeclarationId(1043), + ty: DeclarationId(1044), }, Field { label: "subset_predicate".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), - }, - Field { - label: "list_constant".to_string(), - ty: DeclarationId(1042), - }, - Field { - label: "subset_predicate".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71413,29 +59181,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2161), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "compile_target".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1041), - }, - Field { - label: "expected".to_string(), ty: DeclarationId(1042), -======= - ty: DeclarationId(1040), }, Field { label: "expected".to_string(), - ty: DeclarationId(1041), ->>>>>>> origin/main + ty: DeclarationId(1043), }, ], }, @@ -71450,29 +59206,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2162), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "ratchet_kind".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), - }, - Field { - label: "ratchet_kind".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71487,21 +59231,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2163), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1041), -======= - value: DeclarationId(1040), ->>>>>>> origin/main + value: DeclarationId(1042), }], }, type_params: vec![], @@ -71515,29 +59251,17 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2164), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "authority".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), - }, - Field { - label: "generated_paths".to_string(), - ty: DeclarationId(2162), -======= - ty: DeclarationId(1070), + ty: DeclarationId(1072), }, Field { label: "generated_paths".to_string(), - ty: DeclarationId(2161), ->>>>>>> origin/main + ty: DeclarationId(2163), }, ], }, @@ -71552,37 +59276,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2165), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1071), + ty: DeclarationId(1072), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), - }, - Field { - label: "target_lane".to_string(), - ty: DeclarationId(1070), - }, - Field { - label: "authority_doc".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71597,37 +59305,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2166), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "deferred_gate".to_string(), -<<<<<<< HEAD - ty: DeclarationId(1071), - }, - Field { - label: "target_lane".to_string(), - ty: DeclarationId(1071), - }, - Field { - label: "authority_doc".to_string(), - ty: DeclarationId(1071), -======= - ty: DeclarationId(1070), + ty: DeclarationId(1072), }, Field { label: "target_lane".to_string(), - ty: DeclarationId(1070), + ty: DeclarationId(1072), }, Field { label: "authority_doc".to_string(), - ty: DeclarationId(1070), ->>>>>>> origin/main + ty: DeclarationId(1072), }, ], }, @@ -71642,11 +59334,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2167), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -71665,51 +59353,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), @@ -71735,8 +59379,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec>>>>>> origin/main }], }, type_params: vec![], @@ -71793,11 +59433,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2172), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71811,11 +59447,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2173), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71829,11 +59461,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2174), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71847,11 +59475,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2175), name: None, connective: TypeConnective::Cardinality(CardinalityPayload::new_unchecked( DeclarationId(723), @@ -71868,11 +59492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2176), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71886,11 +59506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2177), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71904,11 +59520,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2178), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71922,11 +59534,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2179), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71940,11 +59548,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2180), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71958,11 +59562,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2181), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71976,11 +59576,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2182), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -71994,11 +59590,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2183), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72012,11 +59604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2184), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72030,11 +59618,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2185), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72048,11 +59632,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2186), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72066,11 +59646,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2187), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72084,11 +59660,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72102,11 +59674,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2189), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -72120,56 +59688,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main name: None, connective: TypeConnective::Conj { children: vec![ @@ -72183,10 +59702,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec>>>>>> origin/main + ty: DeclarationId(1455), }, Field { label: "carrier".to_string(), - ty: DeclarationId(1454), + ty: DeclarationId(1456), }, Field { label: "is_copy".to_string(), @@ -72251,21 +59766,13 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec>>>>>> origin/main + id: DeclarationId(2192), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(604), arguments: vec![TemplateArgument { parameter: DeclarationId(605), -<<<<<<< HEAD - value: DeclarationId(1457), -======= - value: DeclarationId(1456), ->>>>>>> origin/main + value: DeclarationId(1458), }], }, type_params: vec![], @@ -72393,11 +59900,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1680))), produced_by: Some(NodeId(9)), }, ); @@ -72421,11 +59924,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1681))), produced_by: None, }, ); @@ -72433,11 +59932,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1682))), produced_by: Some(NodeId(11)), }, ); @@ -72725,11 +60220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1683))), produced_by: None, }, ); @@ -73593,11 +61084,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1684))), produced_by: None, }, ); @@ -73621,11 +61108,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1681))), produced_by: Some(NodeId(113)), }, ); @@ -73641,11 +61124,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1685))), produced_by: Some(NodeId(115)), }, ); @@ -73653,11 +61132,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1686))), produced_by: None, }, ); @@ -73761,11 +61236,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1687))), produced_by: Some(NodeId(128)), }, ); @@ -73909,11 +61380,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1688))), produced_by: None, }, ); @@ -74025,11 +61492,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1689))), produced_by: None, }, ); @@ -74141,11 +61604,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1690))), produced_by: None, }, ); @@ -74761,11 +62220,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1691))), produced_by: None, }, ); @@ -74877,11 +62332,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1692))), produced_by: Some(NodeId(227)), }, ); @@ -74889,11 +62340,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1693))), produced_by: None, }, ); @@ -74949,11 +62396,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1694))), produced_by: Some(NodeId(234)), }, ); @@ -74961,11 +62404,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1695))), produced_by: None, }, ); @@ -74981,11 +62420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(1696))), produced_by: Some(NodeId(237)), }, ); @@ -75001,11 +62436,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_ports() -> HashMap>>>>>> origin/main + state: PortState::Resolved(TypeShape::new(DeclarationId(2171))), produced_by: Some(NodeId(239)), }, );