diff --git a/Cargo.lock b/Cargo.lock index 604132c6c7c..31483a653e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,6 +209,13 @@ dependencies = [ "slab", ] +[[package]] +name = "gen_gunbc_ci_workflow_dag" +version = "0.1.0" +dependencies = [ + "serde_yaml", +] + [[package]] name = "half" version = "2.7.1" @@ -439,6 +446,12 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "ryu" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" + [[package]] name = "same-file" version = "1.0.6" @@ -500,6 +513,19 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "slab" version = "0.4.12" @@ -574,11 +600,18 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "v3-compiler" version = "0.1.0" dependencies = [ "criterion", + "gen_gunbc_ci_workflow_dag", "libc", "num-bigint", "serde", diff --git a/Cargo.toml b/Cargo.toml index a07b3eef16f..a56531b9e31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,8 @@ exclude = [".stage1"] members = [ # v3 compiler — M0: hand-written substrate skeleton "src/v3/compiler", + # T-WAD Slice 4 — regenerate `dsl/gunbc/ci_github_actions_workflow.dag` from `.github/workflows/ci.yml` + "tools/gen_gunbc_ci_workflow_dag", # T-Ground-Pilot probe — bounded inhabitance-search routing pilot # for the Rust target. Sibling crate so the probe lifecycle is # isolated and the v3-compiler SG-0 ratchet is untouched. @@ -33,6 +35,7 @@ license = "MIT" [workspace.dependencies] serde = { version = "1.0", features = ["derive", "rc"] } serde_json = "1.0" +serde_yaml = "0.9" thiserror = "1.0" toml = "0.8" proptest = "=1.4.0" diff --git a/dsl/extdeps/github/actions.dag b/dsl/extdeps/github/actions.dag index 135914dff26..c279add8c33 100644 --- a/dsl/extdeps/github/actions.dag +++ b/dsl/extdeps/github/actions.dag @@ -235,7 +235,8 @@ type Step name: String?, id: String?, uses: ActionRef, - with: Map, + // `none` models omitted `with:` or YAML `with: {}` (no fabricated action inputs). + with: Map?, env: Map?, if_condition: String?, continue_on_error: Bool, diff --git a/dsl/gunbc/ci.dag b/dsl/gunbc/ci.dag index 2e5fa675bf8..b15e5b01855 100644 --- a/dsl/gunbc/ci.dag +++ b/dsl/gunbc/ci.dag @@ -23,18 +23,19 @@ // // Consumers: // .github/workflows/ci.yml — sole live Actions transport for gunbc CI (single authority). -// dsl/gunbc/ci.dag — compiler-intent gates only (`CIPipeline` / `CIGate`). No parallel `Workflow` -// mirror of `ci.yml` here: that would violate INVARIANTS P2 / modeling-discipline Practice 5 -// (dual encoding without a same-PR generator or structural consumer closing the boundary). -// future: dsl/gunbc/ci_emission.dag (WI-2 T-WAD R3; brief — file not authored yet) — -// `project_github_actions(ci_workflow_dag, runtime: WorkflowRuntime)` → `extdeps.github.actions.Workflow` -// (`WorkflowRuntime` = projection-mode sum per WI-2 brief; replaces retired `EmissionTarget` name — Shape A collision). -// Declaration + pinning first; per-arm bodies Slice 4–5. +// dsl/gunbc/ci.dag — compiler-intent gates (`CIPipeline` / `CIGate`) plus the pinned GitHub +// Actions `Workflow` carrier field on `CIWorkflowDag` (regenerated from `.github/workflows/ci.yml` +// into `dsl/gunbc/ci_github_actions_workflow.dag` — single structural consumer; no hand-parallel +// `Workflow` mirror elsewhere in this module). +// dsl/gunbc/ci_emission.dag — WI-2 / Slice 4: `WorkflowRuntime` + `project_github_actions` + +// pinned `gunbc_ci_yml_workflow` (`project_github_actions(ci_workflow_dag, YamlStatic)`). // future: dag run ci_pipeline — interpreter execution of compiler-intent gates. module gunbc.ci import std.list { List } +import extdeps.github.actions { Workflow } +import gunbc.ci.github_actions_workflow { gunbc_ci_github_actions_workflow } import gunbc.compiler { compiler_cycle, test_package, lint_command, test_command, ignored_test_command @@ -109,9 +110,18 @@ type CIGateEdge { to: CIGate } +// `github_actions_workflow` does not author `pipeline` / `edges` (sole gate-topology +// authority remains those fields). It pins the typed Actions `Workflow` carrier +// regenerated from `.github/workflows/ci.yml` into `dsl/gunbc/ci_github_actions_workflow.dag` +// (byte drift test: `gunbc_ci_github_actions_workflow_dag_matches_yaml_generator_output`). +// That is one mechanical encoding of the repo CI YAML, not a second editorial source for +// which compiler gates exist; gate-vs-Actions alignment is process + follow-on projection +// (WI-2), not dual authority over the same axis (INVARIANTS P2 / modeling Practices 3+5). type CIWorkflowDag { pipeline: CIPipeline edges: List + // Pinned GitHub Actions transport for repository CI (see `dsl/gunbc/ci_github_actions_workflow.dag`). + github_actions_workflow: Workflow } // ── Gates ─────────────────────────────────────────────────────────── @@ -185,5 +195,6 @@ data ci_workflow_dag: CIWorkflowDag = { { from: compile_gates_gate, to: test_gate }, { from: lint_gate, to: l1_gate }, { from: test_gate, to: l1_gate } - ] + ], + github_actions_workflow: gunbc_ci_github_actions_workflow } diff --git a/dsl/gunbc/ci_emission.dag b/dsl/gunbc/ci_emission.dag new file mode 100644 index 00000000000..81dcfb08e1d --- /dev/null +++ b/dsl/gunbc/ci_emission.dag @@ -0,0 +1,40 @@ +// gunbc/ci_emission.dag — T-WAD WI-2 / Slice 4: `WorkflowRuntime` + `project_github_actions`. +// +// Canonical GitHub Actions `Workflow` bytes live in `gunbc.ci.github_actions_workflow` +// (`dsl/gunbc/ci_github_actions_workflow.dag`, regenerated from `.github/workflows/ci.yml`). +// `CIWorkflowDag.github_actions_workflow` pins that carrier as part of the same authority +// row as the gate graph (`dsl/gunbc/ci.dag`). +// +// `project_github_actions(..., YamlStatic)` returns that YAML-pinned carrier (Slice 4: +// no structural projection from `pipeline`/`edges` yet; WI-2 follow-on). Transport-arm +// selection, not a second gate-topology editor. + +module gunbc.ci_emission + +import gunbc.ci { CIWorkflowDag, ci_workflow_dag } +import gunbc.ci.github_actions_workflow { gunbc_ci_github_actions_workflow } +import extdeps.github.actions { Workflow } + +// 🟡 YELLOW (scaffold) — coproduct-dissolution receipt (see modeling-discipline Practice 4). +// Ratified initial surface: YamlStatic | BinaryShim | PythonShim (`docs/design-ci-workflow-emitter-dispatch.md` §3; +// `docs/briefs/t-wad-wi2-substrate-and-slice4-yamlstatic-body-worker.md` §1). `InlineGunbc` stays off the enum until a +// real runtime consumer exists (emitter-dispatch §5.4). + +type WorkflowRuntime = YamlStatic | BinaryShim | PythonShim + +// Slice 5: distinct thin-shim `Workflow` rows (WI-2 brief §1). Placeholders alias the committed +// CI workflow carrier so this file stays structurally validated (M1(2.8)). +data gunbc_ci_emission_binary_shim_placeholder_workflow: Workflow = gunbc_ci_github_actions_workflow + +data gunbc_ci_emission_python_shim_placeholder_workflow: Workflow = gunbc_ci_github_actions_workflow + +// v3 tokenizer maps `fn`, not legacy `func` (which becomes `Ident("func")` and fails top-level dispatch). +fn project_github_actions(dag: CIWorkflowDag, runtime: WorkflowRuntime) -> Workflow = + match runtime { + YamlStatic => dag.github_actions_workflow + BinaryShim => gunbc_ci_emission_binary_shim_placeholder_workflow + PythonShim => gunbc_ci_emission_python_shim_placeholder_workflow + } + +// Pinned projection: same `ci_workflow_dag` row, YamlStatic transport (Slice 4). +data gunbc_ci_yml_workflow: Workflow = project_github_actions(ci_workflow_dag, YamlStatic) diff --git a/dsl/gunbc/ci_github_actions_workflow.dag b/dsl/gunbc/ci_github_actions_workflow.dag new file mode 100644 index 00000000000..bac74c80f59 --- /dev/null +++ b/dsl/gunbc/ci_github_actions_workflow.dag @@ -0,0 +1,598 @@ +// @generated by tools/gen_gunbc_ci_workflow_dag — source: .github/workflows/ci.yml +// Regenerate: CTRL_BUILD_WRAP_CARGO=0 cargo run -q -p gen_gunbc_ci_workflow_dag -- .github/workflows/ci.yml > dsl/gunbc/ci_github_actions_workflow.dag + +module gunbc.ci.github_actions_workflow + +import extdeps.github.actions { + Workflow, Job, Step, RunStep, UsesStep, ActionRef, + WorkflowTrigger, Push, PullRequest, + PullRequestActivity, Opened, Synchronize, Reopened, ReadyForReview, Closed, + WorkflowPermissions, PermRead, PermWrite, PermNone, + ConcurrencySpec, ConcurrencyMappingQueueNotMax, + CancelInProgressSpec, CancelInProgressBool, + HostedRunner, SelfHosted, RunsOnExpression, + RunnerLabel, UbuntuLatest, + ShellType, Bash +} + +data gunbc_ci_github_actions_workflow: Workflow = { + name: "ci", + on: [Push { branches: ["main"], paths: [] }, PullRequest { branches: ["main"], types: [Opened, Synchronize, Reopened, ReadyForReview] }], + concurrency: Some { + value: ConcurrencyMappingQueueNotMax { + group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}-${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}", + cancel_in_progress: Some { value: CancelInProgressBool { value: true } }, + explicit_single: none + } + }, + jobs: [{ + id: "fmt", + name: none, + runner: RunsOnExpression { expression: "${{ vars.CI_RUNNER || 'ubuntu-latest' }}" }, + steps: [UsesStep { + name: Some { value: "Checkout" }, + id: none, + uses: { owner: "actions", repo: "checkout", ref: "v4" }, + with: Some { value: { "fetch-depth": "1" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Setup Rust" }, + id: none, + uses: { owner: "actions-rust-lang", repo: "setup-rust-toolchain", ref: "v1.16.0" }, + with: Some { value: { "components": "rustfmt", "cache": "false", "rustflags": "" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "cargo fmt --all --check" }, + id: none, + run: "cargo fmt --all --check", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }], + needs: [], + env: none, + outputs: none, + if_condition: Some { value: "github.event.pull_request.draft != true" }, + strategy: none, + timeout_minutes: Some { value: 5 }, + continue_on_error: false, + concurrency: none + }, { + id: "ci", + name: none, + runner: RunsOnExpression { expression: "${{ vars.CI_RUNNER || 'ubuntu-latest' }}" }, + steps: [UsesStep { + name: Some { value: "Checkout" }, + id: none, + uses: { owner: "actions", repo: "checkout", ref: "v4" }, + with: Some { value: { "fetch-depth": "0" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Fetch main for PR discipline diffs" }, + id: none, + run: "git fetch origin main:refs/remotes/origin/main", + shell: Bash, + env: none, + working_directory: none, + if_condition: Some { value: "github.event_name == 'pull_request'" }, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "SG-0 net-shrink PR-body discipline (self-test)" }, + id: none, + run: "bash scripts/check-pr-sg0-net-shrink-discipline.sh --self-test", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "SG-0 net-shrink PR-body discipline" }, + id: none, + run: "body=\"${PR_BODY}\"\nappend_file=\"scripts/ci-merge/sg0-pr-body-append.${{ github.event.pull_request.number }}.txt\"\nif [ -f \"${append_file}\" ]; then\n # Prepend so `check-pr-sg0-net-shrink-discipline.sh` (grep head-1 on\n # `SG-0 hand-path delta:`) reads the machine-authored append **first**. PR\n # descriptions often keep template scaffolding or mistaken `+0` paste lines\n # above the fold — appending only left those as the first match and tripped\n # declared-vs-computed mismatch (false fail).\n body=\"$(cat \"${append_file}\")\"$'\\n\\n'\"${body}\"\nfi\nPR_BODY=\"${body}\" bash scripts/check-pr-sg0-net-shrink-discipline.sh\n", + shell: Bash, + env: Some { value: { "PR_BODY": "${{ github.event.pull_request.body }}" } }, + working_directory: none, + if_condition: Some { value: "github.event_name == 'pull_request'" }, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "R4-carve dissolution discipline (self-test)" }, + id: none, + run: "bash scripts/check-r4-carve-dissolution-discipline.sh --self-test", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "R4-carve dissolution discipline" }, + id: none, + run: "bash scripts/check-r4-carve-dissolution-discipline.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Fabrication sentinel ratchet (P0-C)" }, + id: none, + run: "bash scripts/check-fabrication-sentinels.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Release-doc authority check (P2 single-authority discipline)" }, + id: none, + run: "bash scripts/check-release-doc-authority.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Release-doc authority self-test (consumer not ceremonial)" }, + id: none, + run: "bash scripts/test-check-release-doc-authority.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Manager-brief authority check (P2 single-authority discipline)" }, + id: none, + run: "bash scripts/check-manager-brief-authority.sh", + shell: Bash, + env: Some { value: { "GH_TOKEN": "${{ secrets.GITHUB_TOKEN }}" } }, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Manager-brief authority self-test (consumer not ceremonial)" }, + id: none, + run: "bash scripts/test-check-manager-brief-authority.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Rust toolchain single-authority check (P2)" }, + id: none, + run: "bash scripts/check-rust-toolchain-single-authority.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Setup Rust" }, + id: none, + uses: { owner: "actions-rust-lang", repo: "setup-rust-toolchain", ref: "v1.16.0" }, + with: Some { value: { "components": "rustfmt", "cache": "false", "rustflags": "" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Cache Cargo (ci bootstrap gate)" }, + id: none, + uses: { owner: "actions", repo: "cache", ref: "v4" }, + with: Some { value: { "path": "~/.cargo/registry/index/\n~/.cargo/registry/cache/\n~/.cargo/git/db/\ntarget/\n", "key": "cargo-ci-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-${{ hashFiles('src/v3/compiler/src/**', 'src/v3/compiler/tests/**') }}", "restore-keys": "cargo-ci-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-\ncargo-ci-${{ runner.os }}-\n" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 bootstrap snapshot freshness gate (--verify)" }, + id: none, + run: "cargo run -p v3-compiler --features bootstrap-regen-fresh --bin regen_bootstrap -- --verify", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }], + needs: [], + env: none, + outputs: none, + if_condition: Some { value: "github.event.pull_request.draft != true" }, + strategy: none, + timeout_minutes: Some { value: 25 }, + continue_on_error: false, + concurrency: none + }, { + id: "changes", + name: none, + runner: RunsOnExpression { expression: "${{ vars.CI_RUNNER || 'ubuntu-latest' }}" }, + steps: [UsesStep { + name: Some { value: "Checkout" }, + id: none, + uses: { owner: "actions", repo: "checkout", ref: "v4" }, + with: Some { value: { "fetch-depth": "0" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Detect non-docs changes" }, + id: Some { value: "filter" }, + run: "set -euo pipefail\nif [ \"${{ github.event_name }}\" = \"push\" ]; then\n echo \"push event — always run heavy v3 job\"\n echo \"code=true\" >> \"$GITHUB_OUTPUT\"\n exit 0\nfi\ngit fetch origin main:refs/remotes/origin/main\nchanged=$(git diff --name-only origin/main...HEAD)\necho \"Changed files (first 200):\"\necho \"$changed\" | head -200\n# Docs-only allowlist: anything under docs/ OR a root-level *.md\n# file (no slash before .md). Examples that count as docs:\n# docs/audit/foo.md ✓\n# docs/design-x.md ✓\n# WISHLIST.md ✓ (root *.md)\n# ROADMAP.md ✓\n# Examples that count as code (run full v3):\n# src/v3/compiler/src/foo.rs\n# dsl/std/lens_foo.dag\n# scripts/check-foo.sh\n# .github/workflows/ci.yml (workflow self-edit)\n# src/v3/compiler/tests/README.md (nested .md, not root)\nnon_docs=$(echo \"$changed\" | grep -vE '^(docs/.*|[^/]+\\.md)$' || true)\nif [ -n \"$non_docs\" ]; then\n echo \"Non-docs files detected; v3 will run full heavy compute:\"\n echo \"$non_docs\" | head -50\n echo \"code=true\" >> \"$GITHUB_OUTPUT\"\nelse\n echo \"Docs-only PR (allowlist: docs/** + root *.md) — v3 will skip\"\n echo \"(Layer 1 CI mitigation; dissolution trigger = affected-set lens CI integration)\"\n echo \"code=false\" >> \"$GITHUB_OUTPUT\"\nfi\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }], + needs: [], + env: none, + outputs: Some { value: { "code": "${{ steps.filter.outputs.code }}" } }, + if_condition: Some { value: "github.event.pull_request.draft != true" }, + strategy: none, + timeout_minutes: Some { value: 3 }, + continue_on_error: false, + concurrency: none + }, { + id: "v3", + name: none, + runner: SelfHosted { labels: ["ubicloud-standard-8"] }, + steps: [UsesStep { + name: Some { value: "Checkout" }, + id: none, + uses: { owner: "actions", repo: "checkout", ref: "v4" }, + with: Some { value: { "fetch-depth": "1" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Setup Rust" }, + id: none, + uses: { owner: "actions-rust-lang", repo: "setup-rust-toolchain", ref: "v1.16.0" }, + with: Some { value: { "components": "rustfmt, clippy", "cache": "false", "rustflags": "" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Setup Zig C toolchain" }, + id: none, + uses: { owner: "goto-bus-stop", repo: "setup-zig", ref: "v2" }, + with: Some { value: { "version": "0.13.0", "cache": "false" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Configure user-space C linker" }, + id: none, + run: "mkdir -p \"${RUNNER_TEMP}/gunbc-bin\"\ncat > \"${RUNNER_TEMP}/gunbc-bin/zig-cc\" <<'EOF'\n#!/usr/bin/env bash\nexec zig cc \"$@\"\nEOF\nchmod +x \"${RUNNER_TEMP}/gunbc-bin/zig-cc\"\necho \"CC=${RUNNER_TEMP}/gunbc-bin/zig-cc\" >> \"${GITHUB_ENV}\"\necho \"RUSTFLAGS=-D warnings -C linker=${RUNNER_TEMP}/gunbc-bin/zig-cc\" >> \"${GITHUB_ENV}\"\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Setup Python" }, + id: none, + uses: { owner: "actions", repo: "setup-python", ref: "v6" }, + with: Some { value: { "python-version": "3.x" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Setup Go" }, + id: none, + uses: { owner: "actions", repo: "setup-go", ref: "v6" }, + with: Some { value: { "go-version": "stable" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Cache Cargo (v3)" }, + id: none, + uses: { owner: "actions", repo: "cache", ref: "v4" }, + with: Some { value: { "path": "~/.cargo/registry/index/\n~/.cargo/registry/cache/\n~/.cargo/git/db/\ntarget/\n", "key": "cargo-v3-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-${{ hashFiles('src/v3/compiler/src/**', 'src/v3/compiler/tests/**') }}", "restore-keys": "cargo-v3-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-\ncargo-v3-${{ runner.os }}-\n" } }, + env: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Build ExecuteCommand unshare helper" }, + id: none, + run: "cargo build -p execute-command-bootstrap", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Prebuild v3 integration test binary (lane2d wall-clock denominator)" }, + id: none, + run: "set -euo pipefail\nheartbeat() {\n while sleep 60; do\n echo \"v3 prebuild heartbeat: $(date -u +%FT%TZ)\"\n done\n}\nheartbeat &\nheartbeat_pid=$!\ntrap 'kill \"$heartbeat_pid\" 2>/dev/null || true' EXIT\ncargo test -p v3-compiler --test integration --no-run\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 tests (Stage 2d integration module, HOT-FIX SKIPPED)" }, + id: none, + run: "echo \"::notice::v3 lane2d Stage 2d test execution SKIPPED per operator hot-fix directive at gunbc#846 (cold-v3 → ~10min target).\"\necho \"::notice::Restore criteria: per-test wall ≤ 2s under OnceLock/cached_compile amortization (rebuild session per #2722 §5).\"\nexit 0\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 full-suite split guard (integration test targets)" }, + id: none, + run: "scripts/check-v3-full-suite-split-test-targets.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 tests (full suite lib+bins, timings part 1/4)" }, + id: none, + run: "set -euo pipefail\necho \"V3_SUITE_START_TS=$(date +%s)\" >> \"${GITHUB_ENV}\"\n: > /tmp/v3-test-timings.log\nRUSTC_BOOTSTRAP=1 cargo test -p v3-compiler --lib --bins -- -Z unstable-options --report-time 2>&1 | tee /tmp/v3-test-timings.log\nstatus=${PIPESTATUS[0]}\nif [ \"$status\" -ne 0 ]; then\n echo \"::error::cargo test (lib+bins) failed (exit=$status)\"\n exit \"$status\"\nfi\n", + shell: Bash, + env: Some { value: { "CARGO_TERM_COLOR": "never", "RUST_MIN_STACK": "16777216" } }, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 tests (full suite determinism harness, timings part 2/4)" }, + id: none, + run: "set -euo pipefail\nRUSTC_BOOTSTRAP=1 cargo test -p v3-compiler --test determinism_test -- -Z unstable-options --report-time 2>&1 | tee -a /tmp/v3-test-timings.log\nstatus=${PIPESTATUS[0]}\nif [ \"$status\" -ne 0 ]; then\n echo \"::error::cargo test (determinism_test) failed (exit=$status)\"\n exit \"$status\"\nfi\n", + shell: Bash, + env: Some { value: { "CARGO_TERM_COLOR": "never", "RUST_MIN_STACK": "16777216" } }, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 tests (full suite doc tests, timings part 3/4)" }, + id: none, + run: "set -euo pipefail\nRUSTC_BOOTSTRAP=1 cargo test -p v3-compiler --doc -- -Z unstable-options --report-time 2>&1 | tee -a /tmp/v3-test-timings.log\nstatus=${PIPESTATUS[0]}\nif [ \"$status\" -ne 0 ]; then\n echo \"::error::cargo test (--doc) failed (exit=$status)\"\n exit \"$status\"\nfi\n", + shell: Bash, + env: Some { value: { "CARGO_TERM_COLOR": "never", "RUST_MIN_STACK": "16777216" } }, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 tests (full suite integration harness, HOT-FIX zero-test-filter)" }, + id: none, + run: "set -euo pipefail\necho \"::notice::v3 integration test execution SKIPPED via zero-test-filter per operator hot-fix at gunbc#846.\"\necho \"::notice::Guard pattern preserved; integration binary runs zero tests (nonexistent filter).\"\nif [ -z \"${V3_SUITE_START_TS:-}\" ]; then\n echo \"::error::missing V3_SUITE_START_TS (full suite part 1 must run first)\"\n exit 1\nfi\n# Zero-test-filter: `__HOT_FIX_NONEXISTENT_FILTER__` matches no tests;\n# binary runs through libtest setup + reports 0 tests run. Satisfies\n# check-v3-full-suite-split-test-targets.sh pattern requirement.\nRUSTC_BOOTSTRAP=1 cargo test -p v3-compiler --test integration __HOT_FIX_NONEXISTENT_FILTER__ -- -Z unstable-options --report-time 2>&1 | tee -a /tmp/v3-test-timings.log\nstatus=${PIPESTATUS[0]}\nelapsed=$(( $(date +%s) - V3_SUITE_START_TS ))\necho \"v3 full-suite wall time (integration-skipped): ${elapsed}s\"\nif [ \"$status\" -ne 0 ]; then\n echo \"::error::cargo test (integration, zero-filter) failed (exit=$status) — should never happen with nonexistent filter; investigate.\"\n exit \"$status\"\nfi\necho \"::notice::Restore criteria: rebuild session per #2722 §5 OnceLock/cached_compile amortization → per-test wall ≤ 2s ratchet → re-enable per cluster filter (replace __HOT_FIX_NONEXISTENT_FILTER__ with cluster-specific filter).\"\n", + shell: Bash, + env: Some { value: { "CARGO_TERM_COLOR": "never", "RUST_MIN_STACK": "16777216" } }, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 tests (per-test 2s ratchet)" }, + id: none, + run: "if [ ! -s /tmp/v3-test-timings.log ]; then\n echo \"::notice::no timing log captured or log is empty (full-suite steps did not reach cargo test, or tee wrote nothing) — skipping per-test ratchet\"\n exit 0\nfi\nscripts/check-test-timeout.sh /tmp/v3-test-timings.log\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: Some { value: "always()" }, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 Compiler Clippy (default features)" }, + id: none, + run: "cargo clippy -p v3-compiler --all-targets -- -D warnings", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 Compiler Clippy (bootstrap-regen-fresh)" }, + id: none, + run: "cargo clippy -p v3-compiler --all-targets --features bootstrap-regen-fresh -- -D warnings", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "v3 test targets compile with bootstrap-regen-fresh" }, + id: none, + run: "cargo test -p v3-compiler --no-run --features bootstrap-regen-fresh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "L-7 Substrate accessor reconstruction gate" }, + id: none, + run: "# L-7 (INVARIANTS.md): lenses consume substrate query\n# functions (`port`, `node`, `resolve_producer`) instead of\n# reconstructing local `find_port` / `find_behavior` / ...\n# Scan `.dag` lens files for forbidden helper declarations.\nmatches=$(grep -nE \"fn (find_port|find_behavior|resolve_producer|lookup_node|lookup_port)\" src/v3/lenses/*.dag 2>/dev/null || true)\nif [ -n \"$matches\" ]; then\n echo \"::error::L-7 violation: lens reconstructs a substrate lookup locally\"\n echo \"$matches\"\n exit 1\nfi\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "L-8 Lens surface gate" }, + id: none, + run: "# L-8 (INVARIANTS.md): migrated .dag lenses must not collapse\n# their typed failure carriers into primitives at the public\n# Rust surface. The forbidden shape is any `pub fn ... -> T`\n# for T in {usize, bool, i64} inside a hand-written wrapper\n# alongside a generated lens module — e.g., the deleted\n# `pub fn cost_of(&self, port: PortId) -> usize` wrapper that\n# shadowed the generated `CostLookup` carrier.\n#\n# Scope: every `src/v3/compiler/src/lens_*.rs` file (hand-written\n# and `*_generated.rs` — catching a collapsed wrapper in generated\n# code would mean the emitter regressed).\nwrappers=$(ls src/v3/compiler/src/lens_*.rs 2>/dev/null || true)\nif [ -z \"$wrappers\" ]; then\n echo \"L-8: no lens wrapper files to scan\"\n exit 0\nfi\nmatches=$(grep -nE \"pub fn .*-> (usize|bool|i64)\" $wrappers 2>/dev/null || true)\nif [ -n \"$matches\" ]; then\n echo \"::error::L-8 violation: lens wrapper collapses typed carrier to a primitive\"\n echo \"$matches\"\n exit 1\nfi\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Compiler-std consolidation ratchet" }, + id: none, + run: "scripts/check-compiler-std-ratchet.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "Banked-dissolutions ratchet" }, + id: none, + run: "scripts/check-banked-dissolutions.sh", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }], + needs: ["changes"], + env: none, + outputs: none, + if_condition: Some { value: "github.event.pull_request.draft != true && (needs.changes.outputs.code == 'true' || github.event_name == 'push')" }, + strategy: none, + timeout_minutes: Some { value: 120 }, + continue_on_error: false, + concurrency: none + }, { + id: "self_host_ratchet", + name: none, + runner: SelfHosted { labels: ["ubicloud-standard-8"] }, + steps: [RunStep { + name: Some { value: "Validate gate evidence (fail-closed under filter/v3 failure)" }, + id: none, + run: "echo \"Gate evidence: changes.result=${{ needs.changes.result }} v3.result=${{ needs.v3.result }}\"\nif [ \"${{ needs.changes.result }}\" != \"success\" ]; then\n echo \"::error::Layer 1 filter (changes job) did not succeed (result=${{ needs.changes.result }}).\"\n echo \"::error::Cannot determine v3 skip legitimacy — skipped required-checks default to SUCCESS\"\n echo \"::error::in GitHub branch protection (https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks),\"\n echo \"::error::so an explicit step failure here surfaces the missing-evidence as a diagnostic\"\n echo \"::error::per P3 fail-closed / C-8 discipline.\"\n exit 1\nfi\nif [ \"${{ needs.v3.result }}\" = \"failure\" ] || [ \"${{ needs.v3.result }}\" = \"cancelled\" ]; then\n echo \"::error::v3 job did not succeed (result=${{ needs.v3.result }}); ratchet cannot claim green.\"\n exit 1\nfi\n# Either v3.result == success (ran cleanly) or v3.result == skipped (legit docs-only via changes.code=false)\necho \"Gate evidence validated; ratchet may proceed.\"\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: none, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Checkout" }, + id: none, + uses: { owner: "actions", repo: "checkout", ref: "v4" }, + with: Some { value: { "fetch-depth": "1" } }, + env: none, + if_condition: Some { value: "github.event_name == 'push' && github.ref == 'refs/heads/main'" }, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "DB-8 stub (PR / non-main — full matrix is main-push only)" }, + id: none, + run: "echo \"::notice::self_host_ratchet DB-8 release matrix runs only on pushes to main (Lane 1e staged).\"\nexit 0\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: Some { value: "github.event_name != 'push' || github.ref != 'refs/heads/main'" }, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Setup Rust" }, + id: none, + uses: { owner: "actions-rust-lang", repo: "setup-rust-toolchain", ref: "v1.16.0" }, + with: Some { value: { "cache": "false", "rustflags": "" } }, + env: none, + if_condition: Some { value: "github.event_name == 'push' && github.ref == 'refs/heads/main'" }, + continue_on_error: false, + timeout_minutes: none + }, UsesStep { + name: Some { value: "Cache Cargo (self_host_ratchet)" }, + id: none, + uses: { owner: "actions", repo: "cache", ref: "v4" }, + with: Some { value: { "path": "~/.cargo/registry/index/\n~/.cargo/registry/cache/\n~/.cargo/git/db/\ntarget/\n", "key": "cargo-self-host-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-${{ hashFiles('src/v3/compiler/**') }}", "restore-keys": "cargo-self-host-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-\ncargo-self-host-${{ runner.os }}-\n" } }, + env: none, + if_condition: Some { value: "github.event_name == 'push' && github.ref == 'refs/heads/main'" }, + continue_on_error: false, + timeout_minutes: none + }, RunStep { + name: Some { value: "DB-8 determinism_test (5× emit matrix)" }, + id: none, + run: "cargo test -p v3-compiler --release --test determinism_test", + shell: Bash, + env: none, + working_directory: none, + if_condition: Some { value: "github.event_name == 'push' && github.ref == 'refs/heads/main'" }, + continue_on_error: true, + timeout_minutes: none + }, RunStep { + name: Some { value: "DB-8 self_host_fixed_point (staged)" }, + id: none, + run: "cargo run -p v3-compiler --release --bin self_host_fixed_point", + shell: Bash, + env: none, + working_directory: none, + if_condition: Some { value: "github.event_name == 'push' && github.ref == 'refs/heads/main'" }, + continue_on_error: true, + timeout_minutes: none + }, RunStep { + name: Some { value: "DB-8 emit.rs HashMap iteration policy (informational)" }, + id: none, + run: "if grep -nE \"(HashMap|HashSet)::\" src/v3/compiler/src/emit.rs; then\n echo \"::notice::DB-8: emit.rs still uses HashMap/HashSet:: iteration — target is BTree* / sorted keys (determinism_test + ROADMAP Lane 3 Stage 3c prep)\"\nelse\n echo \"emit.rs: no HashMap::/HashSet:: — consider graduating this check to required when Lane 1e clears debt\"\nfi\n", + shell: Bash, + env: none, + working_directory: none, + if_condition: Some { value: "github.event_name == 'push' && github.ref == 'refs/heads/main'" }, + continue_on_error: false, + timeout_minutes: none + }], + needs: ["v3", "changes"], + env: none, + outputs: none, + if_condition: Some { value: "${{ always() && github.event.pull_request.draft != true }}" }, + strategy: none, + timeout_minutes: Some { value: 60 }, + continue_on_error: true, + concurrency: none + }], + env: Some { value: { "CARGO_TERM_COLOR": "always", "RUSTFLAGS": "-D warnings" } }, + permissions: Some { + value: { + contents: PermRead, + pull_requests: PermRead, + issues: PermNone, + actions: PermNone + } + } +} diff --git a/src/v3/compiler/Cargo.toml b/src/v3/compiler/Cargo.toml index d1dce7434b1..57b4c2c7936 100644 --- a/src/v3/compiler/Cargo.toml +++ b/src/v3/compiler/Cargo.toml @@ -44,6 +44,7 @@ libc = { version = "0.2", default-features = false } # R3 C1 — Tier-3 mirror dissolution perf budget (Phase 1 baseline capture); see # `docs/briefs/r3-pb-tier3-perf-budget-worker.md` deliverable 0a/0b. criterion = "0.5" +gen_gunbc_ci_workflow_dag = { path = "../../../tools/gen_gunbc_ci_workflow_dag" } serde = { workspace = true } serde_json = { workspace = true } # T-V2 G-1 manifest ratchet: structured Cargo.toml walk (`toml` value parse). diff --git a/src/v3/compiler/parse_parser_body.txt b/src/v3/compiler/parse_parser_body.txt index b3cb127c688..148bd632351 100644 --- a/src/v3/compiler/parse_parser_body.txt +++ b/src/v3/compiler/parse_parser_body.txt @@ -1503,6 +1503,13 @@ impl<'a> Parser<'a> { fn parse_primary(&mut self) -> Result { let peek = &self.peek().kind; + // Map literals share the `{` prefix with record literals. Top-level `data` + // disambiguates via `looks_like_map_literal` before `parse_record_literal`; + // mirror that here so nested `Map` fields (e.g. GitHub Actions + // `with:`) can use string keys like `"fetch-depth"`. + if matches!(peek, TokenKind::LBrace) && self.looks_like_map_literal() { + return self.parse_map_literal(); + } match primary_prefix_dispatch(peek) { Some(PrimaryPrefixDispatch::If) => return self.parse_if(), Some(PrimaryPrefixDispatch::Match) => return self.parse_match(), diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index 5c2debf5786..d69083aea57 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: 854, - next_declaration_id: 3341, + next_declaration_id: 3345, next_port_id: 1021, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_dag() -> Dag { emit_model_variants: EmitModelVariants::default(), clusters: bootstrapped_fixture_dag_clusters(), optional_match_disjs: bootstrapped_fixture_dag_optional_match_disjs(), - declaration_append_begin_after_bootstrap: 3341, + declaration_append_begin_after_bootstrap: 3345, } } @@ -6302,28 +6302,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(676), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3115, 3143), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3147, 3175), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(557), target: TransformTarget::Callable(DeclarationId(1256)), inputs: vec![PortId(673), PortId(676)], output: PortId(677), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3091, 3144), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3123, 3176), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(558), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(678), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3180, 3208), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3212, 3240), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), target: TransformTarget::Callable(DeclarationId(2525)), inputs: vec![PortId(678)], output: PortId(679), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3171, 3209), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(560), @@ -6332,21 +6332,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(680)], output: PortId(681), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3235, 3243), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3267, 3275), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(561), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(682), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3258, 3286), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3290, 3318), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), target: TransformTarget::Callable(DeclarationId(2526)), inputs: vec![PortId(682)], output: PortId(683), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3249, 3287), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(563), @@ -6359,8 +6359,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3155, - 3167, + 3187, + 3199, ), }, binding: None, @@ -6372,8 +6372,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3218, - 3245, + 3250, + 3277, ), }, binding: Some(PayloadBinding { @@ -6383,7 +6383,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, ], output: PortId(684), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 3295), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3117, 3327), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6391,28 +6391,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(686), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3352, 3380), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3384, 3412), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(565), target: TransformTarget::Callable(DeclarationId(1256)), inputs: vec![PortId(673), PortId(686)], output: PortId(687), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3328, 3381), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3360, 3413), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(566), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(688), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3417, 3445), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3449, 3477), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), target: TransformTarget::Callable(DeclarationId(2527)), inputs: vec![PortId(688)], output: PortId(689), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3408, 3446), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(568), @@ -6421,21 +6421,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(690)], output: PortId(691), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3472, 3480), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3504, 3512), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(569), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(692), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3495, 3523), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3527, 3555), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), target: TransformTarget::Callable(DeclarationId(2528)), inputs: vec![PortId(692)], output: PortId(693), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3486, 3524), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(571), @@ -6448,8 +6448,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3392, - 3404, + 3424, + 3436, ), }, binding: None, @@ -6461,8 +6461,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3455, - 3482, + 3487, + 3514, ), }, binding: Some(PayloadBinding { @@ -6472,7 +6472,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, ], output: PortId(694), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3322, 3532), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3354, 3564), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6480,28 +6480,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(696), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3586, 3614), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3618, 3646), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(573), target: TransformTarget::Callable(DeclarationId(1256)), inputs: vec![PortId(673), PortId(696)], output: PortId(697), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3562, 3615), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3594, 3647), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(574), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(698), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3651, 3679), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3683, 3711), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), target: TransformTarget::Callable(DeclarationId(2529)), inputs: vec![PortId(698)], output: PortId(699), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3642, 3680), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(576), @@ -6510,21 +6510,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(700)], output: PortId(701), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3706, 3714), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3738, 3746), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(577), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(702), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3729, 3757), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3761, 3789), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), target: TransformTarget::Callable(DeclarationId(2530)), inputs: vec![PortId(702)], output: PortId(703), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3720, 3758), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(579), @@ -6537,8 +6537,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3626, - 3638, + 3658, + 3670, ), }, binding: None, @@ -6550,8 +6550,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3689, - 3716, + 3721, + 3748, ), }, binding: Some(PayloadBinding { @@ -6561,7 +6561,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, ], output: PortId(704), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3556, 3766), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3588, 3798), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6569,28 +6569,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(706), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3818, 3846), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3850, 3878), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(581), target: TransformTarget::Callable(DeclarationId(1256)), inputs: vec![PortId(673), PortId(706)], output: PortId(707), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3794, 3847), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3826, 3879), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(582), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(708), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3883, 3911), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3915, 3943), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), target: TransformTarget::Callable(DeclarationId(2531)), inputs: vec![PortId(708)], output: PortId(709), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3874, 3912), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(584), @@ -6599,21 +6599,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(710)], output: PortId(711), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3938, 3946), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3970, 3978), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(585), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(712), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3961, 3989), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3993, 4021), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), target: TransformTarget::Callable(DeclarationId(2532)), inputs: vec![PortId(712)], output: PortId(713), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3952, 3990), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(587), @@ -6626,8 +6626,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3858, - 3870, + 3890, + 3902, ), }, binding: None, @@ -6639,8 +6639,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3921, - 3948, + 3953, + 3980, ), }, binding: Some(PayloadBinding { @@ -6650,7 +6650,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, ], output: PortId(714), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3788, 3998), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3820, 4030), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6658,28 +6658,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(716), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4050, 4078), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4082, 4110), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(589), target: TransformTarget::Callable(DeclarationId(1256)), inputs: vec![PortId(673), PortId(716)], output: PortId(717), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4026, 4079), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4058, 4111), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(590), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(718), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4115, 4143), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4147, 4175), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), target: TransformTarget::Callable(DeclarationId(2533)), inputs: vec![PortId(718)], output: PortId(719), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4106, 4144), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(592), @@ -6688,21 +6688,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(720)], output: PortId(721), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4170, 4178), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4202, 4210), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(593), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(722), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4193, 4221), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4225, 4253), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), target: TransformTarget::Callable(DeclarationId(2534)), inputs: vec![PortId(722)], output: PortId(723), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4184, 4222), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(595), @@ -6715,8 +6715,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 4090, - 4102, + 4122, + 4134, ), }, binding: None, @@ -6728,8 +6728,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 4153, - 4180, + 4185, + 4212, ), }, binding: Some(PayloadBinding { @@ -6739,7 +6739,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, ], output: PortId(724), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4020, 4230), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4052, 4262), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Branch(BranchNode { @@ -6753,8 +6753,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Value".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3067, - 3075, + 3099, + 3107, ), }, binding: Some(PayloadBinding { @@ -6769,8 +6769,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Transform".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3300, - 3312, + 3332, + 3344, ), }, binding: Some(PayloadBinding { @@ -6785,8 +6785,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Branch".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3537, - 3546, + 3569, + 3578, ), }, binding: Some(PayloadBinding { @@ -6801,8 +6801,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Loop".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3771, - 3778, + 3803, + 3810, ), }, binding: Some(PayloadBinding { @@ -6817,8 +6817,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Bind".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 4003, - 4010, + 4035, + 4042, ), }, binding: Some(PayloadBinding { @@ -6828,7 +6828,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, ], output: PortId(725), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3053, 4234), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -6836,7 +6836,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "ci_demo_timing_read".to_string(), value: PortId(725), params: vec![PortId(673), PortId(674)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3053, 4234), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6845,14 +6845,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1195)), inputs: vec![PortId(726), PortId(727)], output: PortId(728), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4625, 4650), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(599), name: "ci_wad_modeled_workflow_timing_witness".to_string(), value: PortId(728), params: vec![PortId(726), PortId(727)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4625, 4650), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6861,14 +6861,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2535)), inputs: vec![], output: PortId(729), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4908, 4913), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(601), name: "_ci_wad_seed_list_declaration_empty".to_string(), value: PortId(729), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4908, 4913), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6877,14 +6877,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2536)), inputs: vec![], output: PortId(730), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4973, 4978), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(603), name: "_ci_wad_seed_list_behavior_empty".to_string(), value: PortId(730), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4973, 4978), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6893,14 +6893,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2537)), inputs: vec![], output: PortId(731), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5036, 5041), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(605), name: "_ci_wad_seed_list_dagport_empty".to_string(), value: PortId(731), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5036, 5041), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6909,14 +6909,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2538)), inputs: vec![], output: PortId(732), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5099, 5104), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(607), name: "_ci_wad_seed_list_cluster_empty".to_string(), value: PortId(732), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5099, 5104), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6925,14 +6925,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2539)), inputs: vec![], output: PortId(733), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5163, 5168), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(609), name: "_ci_wad_empty_list_diagnostic".to_string(), value: PortId(733), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5163, 5168), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6941,14 +6941,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2540)), inputs: vec![], output: PortId(734), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5243, 5248), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(611), name: "_ci_wad_empty_list_witness_tm".to_string(), value: PortId(734), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5243, 5248), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6957,28 +6957,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2542)), inputs: vec![PortId(735)], output: PortId(736), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5359, 5370), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(613), target: TransformTarget::Callable(DeclarationId(1202)), inputs: vec![], output: PortId(737), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5409), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5410, 5441), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), target: TransformTarget::Callable(DeclarationId(2541)), inputs: vec![PortId(736), PortId(737)], output: PortId(738), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5411), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(615), name: "_ci_wad_witnesses_singleton_tm".to_string(), value: PortId(738), params: vec![PortId(735)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5411), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6987,21 +6987,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1201)), inputs: vec![], output: PortId(740), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5512, 5543), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5544, 5575), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), target: TransformTarget::Callable(DeclarationId(2543)), inputs: vec![PortId(739), PortId(740)], output: PortId(741), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5487, 5545), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(618), name: "_ci_wad_violations_singleton".to_string(), value: PortId(741), params: vec![PortId(739)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5487, 5545), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7009,7 +7009,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(619), data: LiteralBits::String("ci_modeled_timing".to_string()), output: PortId(743), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5680, 5699), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5712, 5731), lane2_workflow: None, })); nodes.push(Behavior::Transform(TransformNode { @@ -7017,21 +7017,21 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1203)), inputs: vec![PortId(742)], output: PortId(744), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5733, 5766), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5765, 5798), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), target: TransformTarget::Callable(DeclarationId(2544)), inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5646, 5771), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(622), name: "_ci_wad_dimension_ok_tm_payload".to_string(), value: PortId(745), params: vec![PortId(742)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5646, 5771), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7039,7 +7039,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { id: NodeId(623), data: LiteralBits::String("ci_modeled_timing".to_string()), output: PortId(748), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5928, 5947), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5960, 5979), lane2_workflow: None, })); nodes.push(Behavior::Transform(TransformNode { @@ -7047,28 +7047,28 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1204)), inputs: vec![PortId(747)], output: PortId(749), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5965, 5999), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5997, 6031), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(625), target: TransformTarget::Callable(DeclarationId(1203)), inputs: vec![PortId(746)], output: PortId(750), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6016, 6049), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6048, 6081), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), target: TransformTarget::Callable(DeclarationId(2545)), inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5892, 6054), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(627), name: "_ci_wad_dimension_fail_tm_payload".to_string(), value: PortId(751), params: vec![PortId(746), PortId(747)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5892, 6054), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7077,14 +7077,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1304)), inputs: vec![PortId(752)], output: PortId(754), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6417, 6434), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6449, 6466), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(629), target: TransformTarget::Callable(DeclarationId(1205)), inputs: vec![PortId(753)], output: PortId(755), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6450, 6484), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6482, 6516), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(630), @@ -7093,7 +7093,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(756)], output: PortId(757), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6496, 6504), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6528, 6536), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(631), @@ -7102,14 +7102,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(756)], output: PortId(758), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6506, 6514), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6538, 6546), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(632), target: TransformTarget::Callable(DeclarationId(1205)), inputs: vec![PortId(753)], output: PortId(759), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6520, 6554), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6552, 6586), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(633), @@ -7122,8 +7122,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Empty".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6441, - 6446, + 6473, + 6478, ), }, binding: None, @@ -7135,18 +7135,18 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Cons".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6489, - 6516, + 6521, + 6548, ), }, binding: Some(PayloadBinding { - binding_name: "__payload_6489_6516".to_string(), + binding_name: "__payload_6521_6548".to_string(), payload_port: PortId(756), }), }, ], output: PortId(760), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6411, 6558), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7154,7 +7154,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "report_dim_ok_tm".to_string(), value: PortId(760), params: vec![PortId(752), PortId(753)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6411, 6558), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7163,14 +7163,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1304)), inputs: vec![PortId(761)], output: PortId(764), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6678, 6695), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6710, 6727), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(636), target: TransformTarget::Callable(DeclarationId(1206)), inputs: vec![PortId(762), PortId(763)], output: PortId(765), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6711, 6753), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6743, 6785), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(637), @@ -7179,7 +7179,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(766)], output: PortId(767), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6765, 6773), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6797, 6805), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(638), @@ -7188,14 +7188,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(766)], output: PortId(768), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6775, 6783), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6807, 6815), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(639), target: TransformTarget::Callable(DeclarationId(1206)), inputs: vec![PortId(762), PortId(763)], output: PortId(769), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6789, 6831), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6821, 6863), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(640), @@ -7208,8 +7208,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Empty".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6702, - 6707, + 6734, + 6739, ), }, binding: None, @@ -7221,18 +7221,18 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Cons".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6758, - 6785, + 6790, + 6817, ), }, binding: Some(PayloadBinding { - binding_name: "__payload_6758_6785".to_string(), + binding_name: "__payload_6790_6817".to_string(), payload_port: PortId(766), }), }, ], output: PortId(770), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6672, 6835), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7240,7 +7240,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "report_dim_fail_tm".to_string(), value: PortId(770), params: vec![PortId(761), PortId(762), PortId(763)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6672, 6835), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7249,7 +7249,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1207)), inputs: vec![PortId(771), PortId(772)], output: PortId(774), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6993, 7015), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7025, 7047), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(643), @@ -7258,14 +7258,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(775)], output: PortId(776), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7037, 7048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7069, 7080), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(644), target: TransformTarget::Callable(DeclarationId(1208)), inputs: vec![PortId(771), PortId(772), PortId(776)], output: PortId(777), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7054, 7084), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7086, 7116), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(645), @@ -7278,8 +7278,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6977, - 6989, + 7009, + 7021, ), }, binding: None, @@ -7291,8 +7291,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 7020, - 7050, + 7052, + 7082, ), }, binding: Some(PayloadBinding { @@ -7302,7 +7302,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, ], output: PortId(778), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6962, 7088), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7310,7 +7310,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "report_inhabits_branch_tm".to_string(), value: PortId(778), params: vec![PortId(771), PortId(772), PortId(773)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6962, 7088), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7319,14 +7319,14 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1256)), inputs: vec![PortId(779), PortId(781)], output: PortId(782), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7268, 7294), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7300, 7326), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(648), target: TransformTarget::Callable(DeclarationId(1209)), inputs: vec![PortId(779), PortId(781), PortId(782)], output: PortId(783), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7236, 7295), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7268, 7327), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(649), @@ -7335,7 +7335,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(784)], output: PortId(785), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7311, 7320), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7343, 7352), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(650), @@ -7344,35 +7344,35 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { }, inputs: vec![PortId(784)], output: PortId(786), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7322, 7329), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7354, 7361), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(651), target: TransformTarget::Callable(DeclarationId(1247)), inputs: vec![], output: PortId(787), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7380, 7408), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7412, 7440), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(652), target: TransformTarget::Callable(DeclarationId(1250)), inputs: vec![PortId(786)], output: PortId(788), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7466, 7496), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7498, 7528), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(653), target: TransformTarget::Callable(DeclarationId(1251)), inputs: vec![PortId(785), PortId(788)], output: PortId(789), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7418, 7497), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7450, 7529), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(654), target: TransformTarget::Callable(DeclarationId(1208)), inputs: vec![PortId(779), PortId(787), PortId(789)], output: PortId(790), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7341, 7505), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7373, 7537), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(655), @@ -7385,8 +7385,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Inhabits".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 7221, - 7232, + 7253, + 7264, ), }, binding: Some(PayloadBinding { @@ -7401,18 +7401,18 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "Violates".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 7300, - 7331, + 7332, + 7363, ), }, binding: Some(PayloadBinding { - binding_name: "__payload_7300_7331".to_string(), + binding_name: "__payload_7332_7363".to_string(), payload_port: PortId(784), }), }, ], output: PortId(791), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7207, 7509), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7420,7 +7420,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "dimension_report_tm_from_witness".to_string(), value: PortId(791), params: vec![PortId(779), PortId(780)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7207, 7509), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7429,42 +7429,42 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1304)), inputs: vec![PortId(792)], output: PortId(794), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8488, 8505), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8520, 8537), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(658), target: TransformTarget::Callable(DeclarationId(711)), inputs: vec![PortId(794)], output: PortId(795), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8479, 8506), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8511, 8538), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(659), target: TransformTarget::Callable(DeclarationId(1195)), inputs: vec![PortId(792), PortId(793)], output: PortId(796), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8552, 8577), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8584, 8609), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(660), target: TransformTarget::Callable(DeclarationId(1210)), inputs: vec![PortId(792), PortId(796)], output: PortId(797), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8516, 8578), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8548, 8610), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(661), target: TransformTarget::Callable(DeclarationId(1196)), inputs: vec![PortId(792), PortId(793)], output: PortId(798), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8626, 8670), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8658, 8702), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(662), target: TransformTarget::Callable(DeclarationId(1210)), inputs: vec![PortId(792), PortId(798)], output: PortId(799), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8590, 8671), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8622, 8703), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(663), @@ -7477,8 +7477,8 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "True".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 8516, - 8578, + 8548, + 8610, ), }, binding: None, @@ -7490,15 +7490,15 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "False".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 8590, - 8671, + 8622, + 8703, ), }, binding: None, }, ], output: PortId(800), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8476, 8671), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703), emit_participation: None, })); nodes.push(Behavior::Bind(BindNode { @@ -7506,7 +7506,7 @@ fn bootstrapped_fixture_dag_nodes() -> Vec { name: "demo_ci_modeled_timing_dimension_report".to_string(), value: PortId(800), params: vec![PortId(792), PortId(793)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8476, 8671), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -9834,7 +9834,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(3341); + let mut declarations = Vec::with_capacity(3345); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -39703,11 +39703,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: Some(ValueBody::Unparsed(SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", 1238, - 2462, + 2494, ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1195, 2462), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 1195, 2494), }); declarations.push(Declaration { id: DeclarationId(1195), @@ -39725,7 +39725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 2975, 4234), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3007, 4266), }); declarations.push(Declaration { id: DeclarationId(1196), @@ -39743,7 +39743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4528, 4650), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4560, 4682), }); declarations.push(Declaration { id: DeclarationId(1197), @@ -39761,7 +39761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4844, 4913), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4876, 4945), }); declarations.push(Declaration { id: DeclarationId(1198), @@ -39779,7 +39779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4915, 4978), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4947, 5010), }); declarations.push(Declaration { id: DeclarationId(1199), @@ -39797,7 +39797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4980, 5041), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5012, 5073), }); declarations.push(Declaration { id: DeclarationId(1200), @@ -39815,7 +39815,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5043, 5104), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5075, 5136), }); declarations.push(Declaration { id: DeclarationId(1201), @@ -39833,7 +39833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5106, 5168), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5138, 5200), }); declarations.push(Declaration { id: DeclarationId(1202), @@ -39851,7 +39851,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5170, 5248), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5202, 5280), }); declarations.push(Declaration { id: DeclarationId(1203), @@ -39869,7 +39869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5250, 5411), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5282, 5443), }); declarations.push(Declaration { id: DeclarationId(1204), @@ -39887,7 +39887,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5413, 5545), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5445, 5577), }); declarations.push(Declaration { id: DeclarationId(1205), @@ -39905,7 +39905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5547, 5771), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5579, 5803), }); declarations.push(Declaration { id: DeclarationId(1206), @@ -39923,7 +39923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5773, 6054), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5805, 6086), }); declarations.push(Declaration { id: DeclarationId(1207), @@ -39941,7 +39941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6319, 6558), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6351, 6590), }); declarations.push(Declaration { id: DeclarationId(1208), @@ -39959,7 +39959,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6560, 6835), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6592, 6867), }); declarations.push(Declaration { id: DeclarationId(1209), @@ -39977,7 +39977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6837, 7088), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6869, 7120), }); declarations.push(Declaration { id: DeclarationId(1210), @@ -39995,7 +39995,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7090, 7509), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7122, 7541), }); declarations.push(Declaration { id: DeclarationId(1211), @@ -40013,7 +40013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8370, 8671), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8402, 8703), }); declarations.push(Declaration { id: DeclarationId(1212), @@ -65568,7 +65568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "UsesStep".to_string(), - ty: DeclarationId(2881), + ty: DeclarationId(2882), }, ], }, @@ -65580,7 +65580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11001), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10496, 11091), }); declarations.push(Declaration { id: DeclarationId(1755), @@ -65589,23 +65589,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Bash".to_string(), - ty: DeclarationId(2882), + ty: DeclarationId(2883), }, Field { label: "Sh".to_string(), - ty: DeclarationId(2883), + ty: DeclarationId(2884), }, Field { label: "Pwsh".to_string(), - ty: DeclarationId(2884), + ty: DeclarationId(2885), }, Field { label: "Python".to_string(), - ty: DeclarationId(2885), + ty: DeclarationId(2886), }, Field { label: "Cmd".to_string(), - ty: DeclarationId(2886), + ty: DeclarationId(2887), }, ], }, @@ -65617,7 +65617,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11003, 11051), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11093, 11141), }); declarations.push(Declaration { id: DeclarationId(1756), @@ -65646,7 +65646,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11053, 11116), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11143, 11206), }); declarations.push(Declaration { id: DeclarationId(1757), @@ -65655,35 +65655,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AnnotationError".to_string(), - ty: DeclarationId(2890), + ty: DeclarationId(2891), }, Field { label: "AnnotationWarning".to_string(), - ty: DeclarationId(2894), + ty: DeclarationId(2895), }, Field { label: "AnnotationNotice".to_string(), - ty: DeclarationId(2898), + ty: DeclarationId(2899), }, Field { label: "AnnotationGroup".to_string(), - ty: DeclarationId(2899), + ty: DeclarationId(2900), }, Field { label: "AnnotationEndGroup".to_string(), - ty: DeclarationId(2900), + ty: DeclarationId(2901), }, Field { label: "SetOutput".to_string(), - ty: DeclarationId(2901), + ty: DeclarationId(2902), }, Field { label: "AddMask".to_string(), - ty: DeclarationId(2902), + ty: DeclarationId(2903), }, Field { label: "StopCommands".to_string(), - ty: DeclarationId(2903), + ty: DeclarationId(2904), }, ], }, @@ -65695,7 +65695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11350, 11777), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11867), }); declarations.push(Declaration { id: DeclarationId(1758), @@ -65714,7 +65714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11843, 11892), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11933, 11982), }); declarations.push(Declaration { id: DeclarationId(1759), @@ -65733,7 +65733,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11893, 11946), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11983, 12036), }); declarations.push(Declaration { id: DeclarationId(1760), @@ -65752,7 +65752,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11947, 11998), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12037, 12088), }); declarations.push(Declaration { id: DeclarationId(1761), @@ -65771,7 +65771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11999, 12049), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12089, 12139), }); declarations.push(Declaration { id: DeclarationId(1762), @@ -65790,7 +65790,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12050, 12099), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12140, 12189), }); declarations.push(Declaration { id: DeclarationId(1763), @@ -65809,7 +65809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12100, 12164), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12190, 12254), }); declarations.push(Declaration { id: DeclarationId(1764), @@ -65828,7 +65828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12165, 12221), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12255, 12311), }); declarations.push(Declaration { id: DeclarationId(1765), @@ -65847,7 +65847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12222, 12288), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12312, 12378), }); declarations.push(Declaration { id: DeclarationId(1766), @@ -65856,11 +65856,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Upload".to_string(), - ty: DeclarationId(2905), + ty: DeclarationId(2906), }, Field { label: "Download".to_string(), - ty: DeclarationId(2907), + ty: DeclarationId(2908), }, ], }, @@ -65872,7 +65872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12510, 12675), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12600, 12765), }); declarations.push(Declaration { id: DeclarationId(1767), @@ -65881,15 +65881,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Warn".to_string(), - ty: DeclarationId(2908), + ty: DeclarationId(2909), }, Field { label: "ErrorOut".to_string(), - ty: DeclarationId(2909), + ty: DeclarationId(2910), }, Field { label: "Ignore".to_string(), - ty: DeclarationId(2910), + ty: DeclarationId(2911), }, ], }, @@ -65901,7 +65901,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12677, 12729), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12767, 12819), }); declarations.push(Declaration { id: DeclarationId(1768), @@ -65917,12 +65917,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( "dsl/extdeps/github/actions.dag", - 12821, - 12889, + 12911, + 12979, ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12780, 12889), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12870, 12979), }); declarations.push(Declaration { id: DeclarationId(1769), @@ -65938,12 +65938,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( "dsl/extdeps/github/actions.dag", - 12934, - 13004, + 13024, + 13094, ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12891, 13004), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12981, 13094), }); declarations.push(Declaration { id: DeclarationId(1770), @@ -65952,15 +65952,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "dimensions".to_string(), - ty: DeclarationId(2912), + ty: DeclarationId(2913), }, Field { label: "include".to_string(), - ty: DeclarationId(2914), + ty: DeclarationId(2915), }, Field { label: "exclude".to_string(), - ty: DeclarationId(2916), + ty: DeclarationId(2917), }, Field { label: "fail_fast".to_string(), @@ -65968,7 +65968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "max_parallel".to_string(), - ty: DeclarationId(2917), + ty: DeclarationId(2918), }, ], }, @@ -65980,7 +65980,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13143, 13319), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13233, 13409), }); declarations.push(Declaration { id: DeclarationId(1771), @@ -65989,27 +65989,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Success".to_string(), - ty: DeclarationId(2918), + ty: DeclarationId(2919), }, Field { label: "Failure".to_string(), - ty: DeclarationId(2919), + ty: DeclarationId(2920), }, Field { label: "Cancelled".to_string(), - ty: DeclarationId(2920), + ty: DeclarationId(2921), }, Field { label: "Skipped".to_string(), - ty: DeclarationId(2921), + ty: DeclarationId(2922), }, Field { label: "TimedOut".to_string(), - ty: DeclarationId(2922), + ty: DeclarationId(2923), }, Field { label: "ActionRequired".to_string(), - ty: DeclarationId(2923), + ty: DeclarationId(2924), }, ], }, @@ -66021,7 +66021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13448, 13550), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13538, 13640), }); declarations.push(Declaration { id: DeclarationId(1772), @@ -66037,12 +66037,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( "dsl/extdeps/github/actions.dag", - 13710, - 13771, + 13800, + 13861, ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13676, 13771), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13766, 13861), }); declarations.push(Declaration { id: DeclarationId(1773), @@ -66058,12 +66058,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( "dsl/extdeps/github/actions.dag", - 13809, - 13897, + 13899, + 13987, ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13773, 13897), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13863, 13987), }); declarations.push(Declaration { id: DeclarationId(1774), @@ -66079,12 +66079,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { inhabits: None, value_body: Some(ValueBody::Unparsed(SourceSpan::new( "dsl/extdeps/github/actions.dag", - 13930, - 13988, + 14020, + 14078, ))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13899, 13988), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13989, 14078), }); declarations.push(Declaration { id: DeclarationId(1775), @@ -66101,7 +66101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: Some(ValueBody::Scalar(LiteralBits::Int("360".to_string()))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14064, 14103), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14154, 14193), }); declarations.push(Declaration { id: DeclarationId(1776), @@ -66118,7 +66118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: Some(ValueBody::Scalar(LiteralBits::Int("360".to_string()))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14105, 14148), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14195, 14238), }); declarations.push(Declaration { id: DeclarationId(1777), @@ -66135,7 +66135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: Some(ValueBody::Scalar(LiteralBits::Int("256".to_string()))), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14150, 14189), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 14240, 14279), }); declarations.push(Declaration { id: DeclarationId(1778), @@ -66163,11 +66163,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "GitHubActionsWorkflowYml".to_string(), - ty: DeclarationId(2924), + ty: DeclarationId(2925), }, Field { label: "GitHubActionsWorkflowYaml".to_string(), - ty: DeclarationId(2925), + ty: DeclarationId(2926), }, ], }, @@ -66191,7 +66191,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { specialization_parent: None, inhabits: None, value_body: None, - refinement: Some(DeclarationId(2926)), + refinement: Some(DeclarationId(2927)), nominal_opacity: None, span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2615, 2714), }); @@ -80045,7 +80045,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2506), @@ -80065,7 +80065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4594, 4620), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4626, 4652), }); declarations.push(Declaration { id: DeclarationId(2507), @@ -80085,7 +80085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4888, 4905), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937), }); declarations.push(Declaration { id: DeclarationId(2508), @@ -80105,7 +80105,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4956, 4970), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002), }); declarations.push(Declaration { id: DeclarationId(2509), @@ -80125,7 +80125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5020, 5033), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065), }); declarations.push(Declaration { id: DeclarationId(2510), @@ -80145,7 +80145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5083, 5096), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128), }); declarations.push(Declaration { id: DeclarationId(2511), @@ -80165,7 +80165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5144, 5160), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192), }); declarations.push(Declaration { id: DeclarationId(2512), @@ -80185,7 +80185,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5213, 5239), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5245, 5271), }); declarations.push(Declaration { id: DeclarationId(2513), @@ -80205,7 +80205,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5208, 5240), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272), }); declarations.push(Declaration { id: DeclarationId(2514), @@ -80225,7 +80225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5314, 5340), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372), }); declarations.push(Declaration { id: DeclarationId(2515), @@ -80245,7 +80245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5309, 5341), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373), }); declarations.push(Declaration { id: DeclarationId(2516), @@ -80265,7 +80265,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5466, 5482), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514), }); declarations.push(Declaration { id: DeclarationId(2517), @@ -80285,7 +80285,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5607, 5641), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673), }); declarations.push(Declaration { id: DeclarationId(2518), @@ -80305,7 +80305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5853, 5887), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919), }); declarations.push(Declaration { id: DeclarationId(2519), @@ -80325,7 +80325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6372, 6406), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6404, 6438), }); declarations.push(Declaration { id: DeclarationId(2520), @@ -80345,7 +80345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6633, 6667), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6665, 6699), }); declarations.push(Declaration { id: DeclarationId(2521), @@ -80365,7 +80365,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6923, 6957), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6955, 6989), }); declarations.push(Declaration { id: DeclarationId(2522), @@ -80385,7 +80385,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7137, 7163), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7169, 7195), }); declarations.push(Declaration { id: DeclarationId(2523), @@ -80405,7 +80405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7168, 7202), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7200, 7234), }); declarations.push(Declaration { id: DeclarationId(2524), @@ -80425,7 +80425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8437, 8471), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8469, 8503), }); declarations.push(Declaration { id: DeclarationId(2525), @@ -80445,7 +80445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2526), @@ -80465,7 +80465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2527), @@ -80485,7 +80485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2528), @@ -80505,7 +80505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2529), @@ -80525,7 +80525,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2530), @@ -80545,7 +80545,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2531), @@ -80565,7 +80565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2532), @@ -80585,7 +80585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2533), @@ -80605,7 +80605,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2534), @@ -80625,7 +80625,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3022, 3048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3054, 3080), }); declarations.push(Declaration { id: DeclarationId(2535), @@ -80645,7 +80645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4888, 4905), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4920, 4937), }); declarations.push(Declaration { id: DeclarationId(2536), @@ -80665,7 +80665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4956, 4970), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4988, 5002), }); declarations.push(Declaration { id: DeclarationId(2537), @@ -80685,7 +80685,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5020, 5033), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5052, 5065), }); declarations.push(Declaration { id: DeclarationId(2538), @@ -80705,7 +80705,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5083, 5096), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5115, 5128), }); declarations.push(Declaration { id: DeclarationId(2539), @@ -80725,7 +80725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5144, 5160), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5176, 5192), }); declarations.push(Declaration { id: DeclarationId(2540), @@ -80745,7 +80745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5208, 5240), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5240, 5272), }); declarations.push(Declaration { id: DeclarationId(2541), @@ -80765,7 +80765,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5309, 5341), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5341, 5373), }); declarations.push(Declaration { id: DeclarationId(2542), @@ -80785,7 +80785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5314, 5340), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5372), }); declarations.push(Declaration { id: DeclarationId(2543), @@ -80805,7 +80805,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5466, 5482), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5498, 5514), }); declarations.push(Declaration { id: DeclarationId(2544), @@ -80825,7 +80825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5607, 5641), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5639, 5673), }); declarations.push(Declaration { id: DeclarationId(2545), @@ -80845,7 +80845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5853, 5887), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5885, 5919), }); declarations.push(Declaration { id: DeclarationId(2546), @@ -86637,11 +86637,30 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10854, 10873), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10962), }); declarations.push(Declaration { id: DeclarationId(2877), name: None, + connective: TypeConnective::Cardinality( + CardinalityPayload::new_unchecked_bypassing_idempotence( + DeclarationId(2876), + 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("dsl/extdeps/github/actions.dag", 10943, 10963), + }); + declarations.push(Declaration { + id: DeclarationId(2878), + name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), arguments: vec![ @@ -86663,14 +86682,14 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10905), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10995), }); declarations.push(Declaration { - id: DeclarationId(2878), + id: DeclarationId(2879), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( - DeclarationId(2877), + DeclarationId(2878), CardinalityBound::AtMostOne, ), ), @@ -86682,10 +86701,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10976, 10996), }); declarations.push(Declaration { - id: DeclarationId(2879), + id: DeclarationId(2880), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86701,10 +86720,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025), }); declarations.push(Declaration { - id: DeclarationId(2880), + id: DeclarationId(2881), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86720,10 +86739,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085), }); declarations.push(Declaration { - id: DeclarationId(2881), + id: DeclarationId(2882), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86741,15 +86760,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "with".to_string(), - ty: DeclarationId(2876), + ty: DeclarationId(2877), }, Field { label: "env".to_string(), - ty: DeclarationId(2878), + ty: DeclarationId(2879), }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2879), + ty: DeclarationId(2880), }, Field { label: "continue_on_error".to_string(), @@ -86757,7 +86776,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2880), + ty: DeclarationId(2881), }, ], }, @@ -86769,10 +86788,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11001), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10768, 11091), }); declarations.push(Declaration { - id: DeclarationId(2882), + id: DeclarationId(2883), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86783,10 +86802,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11020, 11024), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11110, 11114), }); declarations.push(Declaration { - id: DeclarationId(2883), + id: DeclarationId(2884), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86797,10 +86816,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11027, 11029), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11117, 11119), }); declarations.push(Declaration { - id: DeclarationId(2884), + id: DeclarationId(2885), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86811,10 +86830,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11032, 11036), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11122, 11126), }); declarations.push(Declaration { - id: DeclarationId(2885), + id: DeclarationId(2886), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86825,10 +86844,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11039, 11045), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11129, 11135), }); declarations.push(Declaration { - id: DeclarationId(2886), + id: DeclarationId(2887), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86839,10 +86858,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11048, 11051), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11138, 11141), }); declarations.push(Declaration { - id: DeclarationId(2887), + id: DeclarationId(2888), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86858,10 +86877,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511), }); declarations.push(Declaration { - id: DeclarationId(2888), + id: DeclarationId(2889), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86877,10 +86896,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523), }); declarations.push(Declaration { - id: DeclarationId(2889), + id: DeclarationId(2890), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86896,10 +86915,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534), }); declarations.push(Declaration { - id: DeclarationId(2890), + id: DeclarationId(2891), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86909,15 +86928,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2887), + ty: DeclarationId(2888), }, Field { label: "line".to_string(), - ty: DeclarationId(2888), + ty: DeclarationId(2889), }, Field { label: "col".to_string(), - ty: DeclarationId(2889), + ty: DeclarationId(2890), }, ], }, @@ -86929,10 +86948,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11373, 11446), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11463, 11536), }); declarations.push(Declaration { - id: DeclarationId(2891), + id: DeclarationId(2892), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86948,10 +86967,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591), }); declarations.push(Declaration { - id: DeclarationId(2892), + id: DeclarationId(2893), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86967,10 +86986,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), }); declarations.push(Declaration { - id: DeclarationId(2893), + id: DeclarationId(2894), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -86986,10 +87005,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614), }); declarations.push(Declaration { - id: DeclarationId(2894), + id: DeclarationId(2895), name: None, connective: TypeConnective::Conj { children: vec![ @@ -86999,15 +87018,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2891), + ty: DeclarationId(2892), }, Field { label: "line".to_string(), - ty: DeclarationId(2892), + ty: DeclarationId(2893), }, Field { label: "col".to_string(), - ty: DeclarationId(2893), + ty: DeclarationId(2894), }, ], }, @@ -87019,10 +87038,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11451, 11526), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11541, 11616), }); declarations.push(Declaration { - id: DeclarationId(2895), + id: DeclarationId(2896), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -87038,10 +87057,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670), }); declarations.push(Declaration { - id: DeclarationId(2896), + id: DeclarationId(2897), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -87057,10 +87076,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682), }); declarations.push(Declaration { - id: DeclarationId(2897), + id: DeclarationId(2898), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -87076,10 +87095,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693), }); declarations.push(Declaration { - id: DeclarationId(2898), + id: DeclarationId(2899), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87089,15 +87108,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2895), + ty: DeclarationId(2896), }, Field { label: "line".to_string(), - ty: DeclarationId(2896), + ty: DeclarationId(2897), }, Field { label: "col".to_string(), - ty: DeclarationId(2897), + ty: DeclarationId(2898), }, ], }, @@ -87109,10 +87128,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11531, 11605), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11621, 11695), }); declarations.push(Declaration { - id: DeclarationId(2899), + id: DeclarationId(2900), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87128,10 +87147,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11643), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11700, 11733), }); declarations.push(Declaration { - id: DeclarationId(2900), + id: DeclarationId(2901), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87142,10 +87161,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11648, 11666), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11738, 11756), }); declarations.push(Declaration { - id: DeclarationId(2901), + id: DeclarationId(2902), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87167,10 +87186,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11671, 11712), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11761, 11802), }); declarations.push(Declaration { - id: DeclarationId(2902), + id: DeclarationId(2903), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87186,10 +87205,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11717, 11742), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11807, 11832), }); declarations.push(Declaration { - id: DeclarationId(2903), + id: DeclarationId(2904), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87205,10 +87224,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11747, 11777), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11837, 11867), }); declarations.push(Declaration { - id: DeclarationId(2904), + id: DeclarationId(2905), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -87224,10 +87243,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677), }); declarations.push(Declaration { - id: DeclarationId(2905), + id: DeclarationId(2906), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87241,7 +87260,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "retention_days".to_string(), - ty: DeclarationId(2904), + ty: DeclarationId(2905), }, Field { label: "if_no_files_found".to_string(), @@ -87257,10 +87276,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12530, 12630), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12620, 12720), }); declarations.push(Declaration { - id: DeclarationId(2906), + id: DeclarationId(2907), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -87276,10 +87295,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763), }); declarations.push(Declaration { - id: DeclarationId(2907), + id: DeclarationId(2908), name: None, connective: TypeConnective::Conj { children: vec![ @@ -87289,7 +87308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "path".to_string(), - ty: DeclarationId(2906), + ty: DeclarationId(2907), }, ], }, @@ -87301,10 +87320,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12635, 12675), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12725, 12765), }); declarations.push(Declaration { - id: DeclarationId(2908), + id: DeclarationId(2909), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87315,10 +87334,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12705, 12709), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12795, 12799), }); declarations.push(Declaration { - id: DeclarationId(2909), + id: DeclarationId(2910), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87329,10 +87348,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12712, 12720), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12802, 12810), }); declarations.push(Declaration { - id: DeclarationId(2910), + id: DeclarationId(2911), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87343,10 +87362,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12723, 12729), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12813, 12819), }); declarations.push(Declaration { - id: DeclarationId(2911), + id: DeclarationId(2912), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(685), @@ -87363,10 +87382,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13191, 13203), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13281, 13293), }); declarations.push(Declaration { - id: DeclarationId(2912), + id: DeclarationId(2913), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -87377,7 +87396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(2911), + value: DeclarationId(2912), }, ], }, @@ -87389,10 +87408,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13179, 13204), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13269, 13294), }); declarations.push(Declaration { - id: DeclarationId(2913), + id: DeclarationId(2914), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -87415,16 +87434,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13221, 13240), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13311, 13330), }); declarations.push(Declaration { - id: DeclarationId(2914), + id: DeclarationId(2915), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), - value: DeclarationId(2913), + value: DeclarationId(2914), }], }, type_params: vec![], @@ -87435,10 +87454,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13216, 13241), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13306, 13331), }); declarations.push(Declaration { - id: DeclarationId(2915), + id: DeclarationId(2916), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -87461,16 +87480,16 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13258, 13277), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13348, 13367), }); declarations.push(Declaration { - id: DeclarationId(2916), + id: DeclarationId(2917), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(685), arguments: vec![TemplateArgument { parameter: DeclarationId(686), - value: DeclarationId(2915), + value: DeclarationId(2916), }], }, type_params: vec![], @@ -87481,10 +87500,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13253, 13278), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13343, 13368), }); declarations.push(Declaration { - id: DeclarationId(2917), + id: DeclarationId(2918), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -87500,10 +87519,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407), }); declarations.push(Declaration { - id: DeclarationId(2918), + id: DeclarationId(2919), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87514,10 +87533,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13473, 13480), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13563, 13570), }); declarations.push(Declaration { - id: DeclarationId(2919), + id: DeclarationId(2920), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87528,10 +87547,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13485, 13492), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13575, 13582), }); declarations.push(Declaration { - id: DeclarationId(2920), + id: DeclarationId(2921), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87542,10 +87561,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13497, 13506), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13587, 13596), }); declarations.push(Declaration { - id: DeclarationId(2921), + id: DeclarationId(2922), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87556,10 +87575,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13511, 13518), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13601, 13608), }); declarations.push(Declaration { - id: DeclarationId(2922), + id: DeclarationId(2923), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87570,10 +87589,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13523, 13531), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13613, 13621), }); declarations.push(Declaration { - id: DeclarationId(2923), + id: DeclarationId(2924), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87584,10 +87603,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13536, 13550), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13626, 13640), }); declarations.push(Declaration { - id: DeclarationId(2924), + id: DeclarationId(2925), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87601,7 +87620,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1935, 1959), }); declarations.push(Declaration { - id: DeclarationId(2925), + id: DeclarationId(2926), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87615,7 +87634,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/ci.dag", 1964, 1989), }); declarations.push(Declaration { - id: DeclarationId(2926), + id: DeclarationId(2927), name: None, connective: TypeConnective::Arrow { inputs: vec![DeclarationId(151)], @@ -87633,7 +87652,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/ci.dag", 2673, 2714), }); declarations.push(Declaration { - id: DeclarationId(2927), + id: DeclarationId(2928), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87652,7 +87671,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2928), + id: DeclarationId(2929), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87666,17 +87685,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2929), + id: DeclarationId(2930), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2927), + ty: DeclarationId(2928), }, Field { label: "None".to_string(), - ty: DeclarationId(2928), + ty: DeclarationId(2929), }, ], }, @@ -87691,7 +87710,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2930), + id: DeclarationId(2931), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87710,7 +87729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2931), + id: DeclarationId(2932), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87724,17 +87743,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2932), + id: DeclarationId(2933), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2930), + ty: DeclarationId(2931), }, Field { label: "None".to_string(), - ty: DeclarationId(2931), + ty: DeclarationId(2932), }, ], }, @@ -87749,7 +87768,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2933), + id: DeclarationId(2934), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87768,7 +87787,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2934), + id: DeclarationId(2935), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87782,17 +87801,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2935), + id: DeclarationId(2936), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2933), + ty: DeclarationId(2934), }, Field { label: "None".to_string(), - ty: DeclarationId(2934), + ty: DeclarationId(2935), }, ], }, @@ -87807,7 +87826,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2936), + id: DeclarationId(2937), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87826,7 +87845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2937), + id: DeclarationId(2938), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87840,17 +87859,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2938), + id: DeclarationId(2939), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2936), + ty: DeclarationId(2937), }, Field { label: "None".to_string(), - ty: DeclarationId(2937), + ty: DeclarationId(2938), }, ], }, @@ -87865,7 +87884,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2939), + id: DeclarationId(2940), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87884,7 +87903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2940), + id: DeclarationId(2941), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87898,17 +87917,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2941), + id: DeclarationId(2942), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2939), + ty: DeclarationId(2940), }, Field { label: "None".to_string(), - ty: DeclarationId(2940), + ty: DeclarationId(2941), }, ], }, @@ -87923,7 +87942,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2942), + id: DeclarationId(2943), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87942,7 +87961,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2943), + id: DeclarationId(2944), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87956,17 +87975,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2944), + id: DeclarationId(2945), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2942), + ty: DeclarationId(2943), }, Field { label: "None".to_string(), - ty: DeclarationId(2943), + ty: DeclarationId(2944), }, ], }, @@ -87981,7 +88000,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2945), + id: DeclarationId(2946), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88000,7 +88019,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2946), + id: DeclarationId(2947), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88014,17 +88033,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2947), + id: DeclarationId(2948), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2945), + ty: DeclarationId(2946), }, Field { label: "None".to_string(), - ty: DeclarationId(2946), + ty: DeclarationId(2947), }, ], }, @@ -88039,7 +88058,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2948), + id: DeclarationId(2949), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88058,7 +88077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2949), + id: DeclarationId(2950), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88072,17 +88091,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2950), + id: DeclarationId(2951), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2948), + ty: DeclarationId(2949), }, Field { label: "None".to_string(), - ty: DeclarationId(2949), + ty: DeclarationId(2950), }, ], }, @@ -88097,7 +88116,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2951), + id: DeclarationId(2952), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88116,7 +88135,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2952), + id: DeclarationId(2953), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88130,17 +88149,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2953), + id: DeclarationId(2954), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2951), + ty: DeclarationId(2952), }, Field { label: "None".to_string(), - ty: DeclarationId(2952), + ty: DeclarationId(2953), }, ], }, @@ -88155,7 +88174,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2954), + id: DeclarationId(2955), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88174,7 +88193,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2955), + id: DeclarationId(2956), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88188,17 +88207,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2956), + id: DeclarationId(2957), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2954), + ty: DeclarationId(2955), }, Field { label: "None".to_string(), - ty: DeclarationId(2955), + ty: DeclarationId(2956), }, ], }, @@ -88213,7 +88232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2957), + id: DeclarationId(2958), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88232,7 +88251,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16964, 16984), }); declarations.push(Declaration { - id: DeclarationId(2958), + id: DeclarationId(2959), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88246,17 +88265,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16964, 16984), }); declarations.push(Declaration { - id: DeclarationId(2959), + id: DeclarationId(2960), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2957), + ty: DeclarationId(2958), }, Field { label: "None".to_string(), - ty: DeclarationId(2958), + ty: DeclarationId(2959), }, ], }, @@ -88271,7 +88290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16964, 16984), }); declarations.push(Declaration { - id: DeclarationId(2960), + id: DeclarationId(2961), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88290,7 +88309,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17620, 17627), }); declarations.push(Declaration { - id: DeclarationId(2961), + id: DeclarationId(2962), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88304,17 +88323,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17620, 17627), }); declarations.push(Declaration { - id: DeclarationId(2962), + id: DeclarationId(2963), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2960), + ty: DeclarationId(2961), }, Field { label: "None".to_string(), - ty: DeclarationId(2961), + ty: DeclarationId(2962), }, ], }, @@ -88329,7 +88348,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17620, 17627), }); declarations.push(Declaration { - id: DeclarationId(2963), + id: DeclarationId(2964), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88348,7 +88367,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21380, 21390), }); declarations.push(Declaration { - id: DeclarationId(2964), + id: DeclarationId(2965), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88362,17 +88381,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21380, 21390), }); declarations.push(Declaration { - id: DeclarationId(2965), + id: DeclarationId(2966), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2963), + ty: DeclarationId(2964), }, Field { label: "None".to_string(), - ty: DeclarationId(2964), + ty: DeclarationId(2965), }, ], }, @@ -88387,7 +88406,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21380, 21390), }); declarations.push(Declaration { - id: DeclarationId(2966), + id: DeclarationId(2967), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88406,7 +88425,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21515, 21522), }); declarations.push(Declaration { - id: DeclarationId(2967), + id: DeclarationId(2968), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88420,17 +88439,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21515, 21522), }); declarations.push(Declaration { - id: DeclarationId(2968), + id: DeclarationId(2969), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2966), + ty: DeclarationId(2967), }, Field { label: "None".to_string(), - ty: DeclarationId(2967), + ty: DeclarationId(2968), }, ], }, @@ -88445,7 +88464,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21515, 21522), }); declarations.push(Declaration { - id: DeclarationId(2969), + id: DeclarationId(2970), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88464,7 +88483,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21589, 21593), }); declarations.push(Declaration { - id: DeclarationId(2970), + id: DeclarationId(2971), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88478,17 +88497,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21589, 21593), }); declarations.push(Declaration { - id: DeclarationId(2971), + id: DeclarationId(2972), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2969), + ty: DeclarationId(2970), }, Field { label: "None".to_string(), - ty: DeclarationId(2970), + ty: DeclarationId(2971), }, ], }, @@ -88503,7 +88522,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21589, 21593), }); declarations.push(Declaration { - id: DeclarationId(2972), + id: DeclarationId(2973), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88522,7 +88541,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23360, 23367), }); declarations.push(Declaration { - id: DeclarationId(2973), + id: DeclarationId(2974), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88536,17 +88555,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23360, 23367), }); declarations.push(Declaration { - id: DeclarationId(2974), + id: DeclarationId(2975), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2972), + ty: DeclarationId(2973), }, Field { label: "None".to_string(), - ty: DeclarationId(2973), + ty: DeclarationId(2974), }, ], }, @@ -88561,7 +88580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23360, 23367), }); declarations.push(Declaration { - id: DeclarationId(2975), + id: DeclarationId(2976), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88580,7 +88599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23872, 23879), }); declarations.push(Declaration { - id: DeclarationId(2976), + id: DeclarationId(2977), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88594,17 +88613,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23872, 23879), }); declarations.push(Declaration { - id: DeclarationId(2977), + id: DeclarationId(2978), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2975), + ty: DeclarationId(2976), }, Field { label: "None".to_string(), - ty: DeclarationId(2976), + ty: DeclarationId(2977), }, ], }, @@ -88619,7 +88638,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23872, 23879), }); declarations.push(Declaration { - id: DeclarationId(2978), + id: DeclarationId(2979), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88638,7 +88657,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23966, 23973), }); declarations.push(Declaration { - id: DeclarationId(2979), + id: DeclarationId(2980), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88652,17 +88671,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23966, 23973), }); declarations.push(Declaration { - id: DeclarationId(2980), + id: DeclarationId(2981), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2978), + ty: DeclarationId(2979), }, Field { label: "None".to_string(), - ty: DeclarationId(2979), + ty: DeclarationId(2980), }, ], }, @@ -88677,7 +88696,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23966, 23973), }); declarations.push(Declaration { - id: DeclarationId(2981), + id: DeclarationId(2982), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88696,7 +88715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24196, 24211), }); declarations.push(Declaration { - id: DeclarationId(2982), + id: DeclarationId(2983), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88710,17 +88729,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24196, 24211), }); declarations.push(Declaration { - id: DeclarationId(2983), + id: DeclarationId(2984), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2981), + ty: DeclarationId(2982), }, Field { label: "None".to_string(), - ty: DeclarationId(2982), + ty: DeclarationId(2983), }, ], }, @@ -88735,7 +88754,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24196, 24211), }); declarations.push(Declaration { - id: DeclarationId(2984), + id: DeclarationId(2985), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88754,7 +88773,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24222, 24235), }); declarations.push(Declaration { - id: DeclarationId(2985), + id: DeclarationId(2986), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88768,17 +88787,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24222, 24235), }); declarations.push(Declaration { - id: DeclarationId(2986), + id: DeclarationId(2987), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2984), + ty: DeclarationId(2985), }, Field { label: "None".to_string(), - ty: DeclarationId(2985), + ty: DeclarationId(2986), }, ], }, @@ -88793,7 +88812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24222, 24235), }); declarations.push(Declaration { - id: DeclarationId(2987), + id: DeclarationId(2988), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88812,7 +88831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24251, 24264), }); declarations.push(Declaration { - id: DeclarationId(2988), + id: DeclarationId(2989), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88826,17 +88845,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24251, 24264), }); declarations.push(Declaration { - id: DeclarationId(2989), + id: DeclarationId(2990), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2987), + ty: DeclarationId(2988), }, Field { label: "None".to_string(), - ty: DeclarationId(2988), + ty: DeclarationId(2989), }, ], }, @@ -88851,7 +88870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24251, 24264), }); declarations.push(Declaration { - id: DeclarationId(2990), + id: DeclarationId(2991), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88870,7 +88889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24374, 24381), }); declarations.push(Declaration { - id: DeclarationId(2991), + id: DeclarationId(2992), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88884,17 +88903,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24374, 24381), }); declarations.push(Declaration { - id: DeclarationId(2992), + id: DeclarationId(2993), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2990), + ty: DeclarationId(2991), }, Field { label: "None".to_string(), - ty: DeclarationId(2991), + ty: DeclarationId(2992), }, ], }, @@ -88909,7 +88928,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24374, 24381), }); declarations.push(Declaration { - id: DeclarationId(2993), + id: DeclarationId(2994), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88928,7 +88947,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2994), + id: DeclarationId(2995), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88942,17 +88961,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2995), + id: DeclarationId(2996), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2993), + ty: DeclarationId(2994), }, Field { label: "None".to_string(), - ty: DeclarationId(2994), + ty: DeclarationId(2995), }, ], }, @@ -88967,7 +88986,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2996), + id: DeclarationId(2997), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88986,7 +89005,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2997), + id: DeclarationId(2998), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89000,17 +89019,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2998), + id: DeclarationId(2999), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2996), + ty: DeclarationId(2997), }, Field { label: "None".to_string(), - ty: DeclarationId(2997), + ty: DeclarationId(2998), }, ], }, @@ -89025,7 +89044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2999), + id: DeclarationId(3000), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89044,7 +89063,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(3000), + id: DeclarationId(3001), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89058,17 +89077,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(3001), + id: DeclarationId(3002), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2999), + ty: DeclarationId(3000), }, Field { label: "None".to_string(), - ty: DeclarationId(3000), + ty: DeclarationId(3001), }, ], }, @@ -89083,7 +89102,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(3002), + id: DeclarationId(3003), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89102,7 +89121,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(3003), + id: DeclarationId(3004), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89116,17 +89135,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(3004), + id: DeclarationId(3005), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3002), + ty: DeclarationId(3003), }, Field { label: "None".to_string(), - ty: DeclarationId(3003), + ty: DeclarationId(3004), }, ], }, @@ -89141,7 +89160,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(3005), + id: DeclarationId(3006), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89160,7 +89179,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(3006), + id: DeclarationId(3007), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89174,17 +89193,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(3007), + id: DeclarationId(3008), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3005), + ty: DeclarationId(3006), }, Field { label: "None".to_string(), - ty: DeclarationId(3006), + ty: DeclarationId(3007), }, ], }, @@ -89199,7 +89218,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(3008), + id: DeclarationId(3009), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89218,7 +89237,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(3009), + id: DeclarationId(3010), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89232,17 +89251,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(3010), + id: DeclarationId(3011), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3008), + ty: DeclarationId(3009), }, Field { label: "None".to_string(), - ty: DeclarationId(3009), + ty: DeclarationId(3010), }, ], }, @@ -89257,7 +89276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(3011), + id: DeclarationId(3012), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89276,7 +89295,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296), }); declarations.push(Declaration { - id: DeclarationId(3012), + id: DeclarationId(3013), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89290,17 +89309,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296), }); declarations.push(Declaration { - id: DeclarationId(3013), + id: DeclarationId(3014), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3011), + ty: DeclarationId(3012), }, Field { label: "None".to_string(), - ty: DeclarationId(3012), + ty: DeclarationId(3013), }, ], }, @@ -89315,7 +89334,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22288, 22296), }); declarations.push(Declaration { - id: DeclarationId(3014), + id: DeclarationId(3015), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89334,7 +89353,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354), }); declarations.push(Declaration { - id: DeclarationId(3015), + id: DeclarationId(3016), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89348,17 +89367,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354), }); declarations.push(Declaration { - id: DeclarationId(3016), + id: DeclarationId(3017), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3014), + ty: DeclarationId(3015), }, Field { label: "None".to_string(), - ty: DeclarationId(3015), + ty: DeclarationId(3016), }, ], }, @@ -89373,7 +89392,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22345, 22354), }); declarations.push(Declaration { - id: DeclarationId(3017), + id: DeclarationId(3018), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89392,7 +89411,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429), }); declarations.push(Declaration { - id: DeclarationId(3018), + id: DeclarationId(3019), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89406,17 +89425,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429), }); declarations.push(Declaration { - id: DeclarationId(3019), + id: DeclarationId(3020), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3017), + ty: DeclarationId(3018), }, Field { label: "None".to_string(), - ty: DeclarationId(3018), + ty: DeclarationId(3019), }, ], }, @@ -89431,7 +89450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22420, 22429), }); declarations.push(Declaration { - id: DeclarationId(3020), + id: DeclarationId(3021), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89450,7 +89469,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818), }); declarations.push(Declaration { - id: DeclarationId(3021), + id: DeclarationId(3022), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89464,17 +89483,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818), }); declarations.push(Declaration { - id: DeclarationId(3022), + id: DeclarationId(3023), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3020), + ty: DeclarationId(3021), }, Field { label: "None".to_string(), - ty: DeclarationId(3021), + ty: DeclarationId(3022), }, ], }, @@ -89489,7 +89508,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22806, 22818), }); declarations.push(Declaration { - id: DeclarationId(3023), + id: DeclarationId(3024), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89508,7 +89527,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693), }); declarations.push(Declaration { - id: DeclarationId(3024), + id: DeclarationId(3025), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89522,17 +89541,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693), }); declarations.push(Declaration { - id: DeclarationId(3025), + id: DeclarationId(3026), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3023), + ty: DeclarationId(3024), }, Field { label: "None".to_string(), - ty: DeclarationId(3024), + ty: DeclarationId(3025), }, ], }, @@ -89547,7 +89566,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23681, 23693), }); declarations.push(Declaration { - id: DeclarationId(3026), + id: DeclarationId(3027), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89566,7 +89585,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019), }); declarations.push(Declaration { - id: DeclarationId(3027), + id: DeclarationId(3028), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89580,17 +89599,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019), }); declarations.push(Declaration { - id: DeclarationId(3028), + id: DeclarationId(3029), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3026), + ty: DeclarationId(3027), }, Field { label: "None".to_string(), - ty: DeclarationId(3027), + ty: DeclarationId(3028), }, ], }, @@ -89605,7 +89624,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 24004, 24019), }); declarations.push(Declaration { - id: DeclarationId(3029), + id: DeclarationId(3030), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89624,7 +89643,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874), }); declarations.push(Declaration { - id: DeclarationId(3030), + id: DeclarationId(3031), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89638,17 +89657,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874), }); declarations.push(Declaration { - id: DeclarationId(3031), + id: DeclarationId(3032), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3029), + ty: DeclarationId(3030), }, Field { label: "None".to_string(), - ty: DeclarationId(3030), + ty: DeclarationId(3031), }, ], }, @@ -89663,7 +89682,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 867, 874), }); declarations.push(Declaration { - id: DeclarationId(3032), + id: DeclarationId(3033), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89682,7 +89701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807), }); declarations.push(Declaration { - id: DeclarationId(3033), + id: DeclarationId(3034), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89696,17 +89715,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807), }); declarations.push(Declaration { - id: DeclarationId(3034), + id: DeclarationId(3035), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3032), + ty: DeclarationId(3033), }, Field { label: "None".to_string(), - ty: DeclarationId(3033), + ty: DeclarationId(3034), }, ], }, @@ -89721,7 +89740,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11800, 11807), }); declarations.push(Declaration { - id: DeclarationId(3035), + id: DeclarationId(3036), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89740,7 +89759,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939), }); declarations.push(Declaration { - id: DeclarationId(3036), + id: DeclarationId(3037), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89754,17 +89773,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939), }); declarations.push(Declaration { - id: DeclarationId(3037), + id: DeclarationId(3038), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3035), + ty: DeclarationId(3036), }, Field { label: "None".to_string(), - ty: DeclarationId(3036), + ty: DeclarationId(3037), }, ], }, @@ -89779,7 +89798,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11925, 11939), }); declarations.push(Declaration { - id: DeclarationId(3038), + id: DeclarationId(3039), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89798,7 +89817,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966), }); declarations.push(Declaration { - id: DeclarationId(3039), + id: DeclarationId(3040), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89812,17 +89831,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966), }); declarations.push(Declaration { - id: DeclarationId(3040), + id: DeclarationId(3041), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3038), + ty: DeclarationId(3039), }, Field { label: "None".to_string(), - ty: DeclarationId(3039), + ty: DeclarationId(3040), }, ], }, @@ -89837,7 +89856,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11952, 11966), }); declarations.push(Declaration { - id: DeclarationId(3041), + id: DeclarationId(3042), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89856,7 +89875,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991), }); declarations.push(Declaration { - id: DeclarationId(3042), + id: DeclarationId(3043), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89870,17 +89889,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991), }); declarations.push(Declaration { - id: DeclarationId(3043), + id: DeclarationId(3044), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3041), + ty: DeclarationId(3042), }, Field { label: "None".to_string(), - ty: DeclarationId(3042), + ty: DeclarationId(3043), }, ], }, @@ -89895,7 +89914,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11981, 11991), }); declarations.push(Declaration { - id: DeclarationId(3044), + id: DeclarationId(3045), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89914,7 +89933,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026), }); declarations.push(Declaration { - id: DeclarationId(3045), + id: DeclarationId(3046), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89928,17 +89947,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026), }); declarations.push(Declaration { - id: DeclarationId(3046), + id: DeclarationId(3047), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3044), + ty: DeclarationId(3045), }, Field { label: "None".to_string(), - ty: DeclarationId(3045), + ty: DeclarationId(3046), }, ], }, @@ -89953,7 +89972,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 12011, 12026), }); declarations.push(Declaration { - id: DeclarationId(3047), + id: DeclarationId(3048), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89972,7 +89991,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484), }); declarations.push(Declaration { - id: DeclarationId(3048), + id: DeclarationId(3049), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89986,17 +90005,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484), }); declarations.push(Declaration { - id: DeclarationId(3049), + id: DeclarationId(3050), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3047), + ty: DeclarationId(3048), }, Field { label: "None".to_string(), - ty: DeclarationId(3048), + ty: DeclarationId(3049), }, ], }, @@ -90011,7 +90030,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15469, 15484), }); declarations.push(Declaration { - id: DeclarationId(3050), + id: DeclarationId(3051), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90030,7 +90049,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533), }); declarations.push(Declaration { - id: DeclarationId(3051), + id: DeclarationId(3052), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90044,17 +90063,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533), }); declarations.push(Declaration { - id: DeclarationId(3052), + id: DeclarationId(3053), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3050), + ty: DeclarationId(3051), }, Field { label: "None".to_string(), - ty: DeclarationId(3051), + ty: DeclarationId(3052), }, ], }, @@ -90069,7 +90088,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18518, 18533), }); declarations.push(Declaration { - id: DeclarationId(3053), + id: DeclarationId(3054), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90088,7 +90107,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031), }); declarations.push(Declaration { - id: DeclarationId(3054), + id: DeclarationId(3055), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90102,17 +90121,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031), }); declarations.push(Declaration { - id: DeclarationId(3055), + id: DeclarationId(3056), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3053), + ty: DeclarationId(3054), }, Field { label: "None".to_string(), - ty: DeclarationId(3054), + ty: DeclarationId(3055), }, ], }, @@ -90127,7 +90146,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19007, 19031), }); declarations.push(Declaration { - id: DeclarationId(3056), + id: DeclarationId(3057), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90146,7 +90165,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600), }); declarations.push(Declaration { - id: DeclarationId(3057), + id: DeclarationId(3058), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90160,17 +90179,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600), }); declarations.push(Declaration { - id: DeclarationId(3058), + id: DeclarationId(3059), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3056), + ty: DeclarationId(3057), }, Field { label: "None".to_string(), - ty: DeclarationId(3057), + ty: DeclarationId(3058), }, ], }, @@ -90185,7 +90204,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19585, 19600), }); declarations.push(Declaration { - id: DeclarationId(3059), + id: DeclarationId(3060), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90204,7 +90223,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645), }); declarations.push(Declaration { - id: DeclarationId(3060), + id: DeclarationId(3061), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90218,17 +90237,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645), }); declarations.push(Declaration { - id: DeclarationId(3061), + id: DeclarationId(3062), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3059), + ty: DeclarationId(3060), }, Field { label: "None".to_string(), - ty: DeclarationId(3060), + ty: DeclarationId(3061), }, ], }, @@ -90243,7 +90262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19623, 19645), }); declarations.push(Declaration { - id: DeclarationId(3062), + id: DeclarationId(3063), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90262,7 +90281,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(3063), + id: DeclarationId(3064), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90276,17 +90295,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(3064), + id: DeclarationId(3065), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3062), + ty: DeclarationId(3063), }, Field { label: "None".to_string(), - ty: DeclarationId(3063), + ty: DeclarationId(3064), }, ], }, @@ -90301,7 +90320,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(3065), + id: DeclarationId(3066), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90320,7 +90339,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(3066), + id: DeclarationId(3067), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90334,17 +90353,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(3067), + id: DeclarationId(3068), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3065), + ty: DeclarationId(3066), }, Field { label: "None".to_string(), - ty: DeclarationId(3066), + ty: DeclarationId(3067), }, ], }, @@ -90359,7 +90378,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(3068), + id: DeclarationId(3069), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90378,7 +90397,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(3069), + id: DeclarationId(3070), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90392,17 +90411,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(3070), + id: DeclarationId(3071), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3068), + ty: DeclarationId(3069), }, Field { label: "None".to_string(), - ty: DeclarationId(3069), + ty: DeclarationId(3070), }, ], }, @@ -90417,7 +90436,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(3071), + id: DeclarationId(3072), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90436,7 +90455,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(3072), + id: DeclarationId(3073), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90450,17 +90469,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(3073), + id: DeclarationId(3074), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3071), + ty: DeclarationId(3072), }, Field { label: "None".to_string(), - ty: DeclarationId(3072), + ty: DeclarationId(3073), }, ], }, @@ -90475,7 +90494,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(3074), + id: DeclarationId(3075), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90494,7 +90513,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(3075), + id: DeclarationId(3076), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90508,17 +90527,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(3076), + id: DeclarationId(3077), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3074), + ty: DeclarationId(3075), }, Field { label: "None".to_string(), - ty: DeclarationId(3075), + ty: DeclarationId(3076), }, ], }, @@ -90533,7 +90552,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(3077), + id: DeclarationId(3078), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90552,7 +90571,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(3078), + id: DeclarationId(3079), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90566,17 +90585,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(3079), + id: DeclarationId(3080), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3077), + ty: DeclarationId(3078), }, Field { label: "None".to_string(), - ty: DeclarationId(3078), + ty: DeclarationId(3079), }, ], }, @@ -90591,7 +90610,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(3080), + id: DeclarationId(3081), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90610,7 +90629,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323), }); declarations.push(Declaration { - id: DeclarationId(3081), + id: DeclarationId(3082), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90624,17 +90643,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323), }); declarations.push(Declaration { - id: DeclarationId(3082), + id: DeclarationId(3083), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3080), + ty: DeclarationId(3081), }, Field { label: "None".to_string(), - ty: DeclarationId(3081), + ty: DeclarationId(3082), }, ], }, @@ -90649,7 +90668,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6286, 6323), }); declarations.push(Declaration { - id: DeclarationId(3083), + id: DeclarationId(3084), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90668,7 +90687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358), }); declarations.push(Declaration { - id: DeclarationId(3084), + id: DeclarationId(3085), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90682,17 +90701,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358), }); declarations.push(Declaration { - id: DeclarationId(3085), + id: DeclarationId(3086), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3083), + ty: DeclarationId(3084), }, Field { label: "None".to_string(), - ty: DeclarationId(3084), + ty: DeclarationId(3085), }, ], }, @@ -90707,7 +90726,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6345, 6358), }); declarations.push(Declaration { - id: DeclarationId(3086), + id: DeclarationId(3087), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90726,7 +90745,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057), }); declarations.push(Declaration { - id: DeclarationId(3087), + id: DeclarationId(3088), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90740,17 +90759,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057), }); declarations.push(Declaration { - id: DeclarationId(3088), + id: DeclarationId(3089), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3086), + ty: DeclarationId(3087), }, Field { label: "None".to_string(), - ty: DeclarationId(3087), + ty: DeclarationId(3088), }, ], }, @@ -90765,7 +90784,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7030, 7057), }); declarations.push(Declaration { - id: DeclarationId(3089), + id: DeclarationId(3090), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90784,7 +90803,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079), }); declarations.push(Declaration { - id: DeclarationId(3090), + id: DeclarationId(3091), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90798,17 +90817,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079), }); declarations.push(Declaration { - id: DeclarationId(3091), + id: DeclarationId(3092), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3089), + ty: DeclarationId(3090), }, Field { label: "None".to_string(), - ty: DeclarationId(3090), + ty: DeclarationId(3091), }, ], }, @@ -90823,7 +90842,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7074, 7079), }); declarations.push(Declaration { - id: DeclarationId(3092), + id: DeclarationId(3093), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90842,7 +90861,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442), }); declarations.push(Declaration { - id: DeclarationId(3093), + id: DeclarationId(3094), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90856,17 +90875,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442), }); declarations.push(Declaration { - id: DeclarationId(3094), + id: DeclarationId(3095), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3092), + ty: DeclarationId(3093), }, Field { label: "None".to_string(), - ty: DeclarationId(3093), + ty: DeclarationId(3094), }, ], }, @@ -90881,7 +90900,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8435, 8442), }); declarations.push(Declaration { - id: DeclarationId(3095), + id: DeclarationId(3096), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90900,7 +90919,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460), }); declarations.push(Declaration { - id: DeclarationId(3096), + id: DeclarationId(3097), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90914,17 +90933,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460), }); declarations.push(Declaration { - id: DeclarationId(3097), + id: DeclarationId(3098), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3095), + ty: DeclarationId(3096), }, Field { label: "None".to_string(), - ty: DeclarationId(3096), + ty: DeclarationId(3097), }, ], }, @@ -90939,7 +90958,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8453, 8460), }); declarations.push(Declaration { - id: DeclarationId(3098), + id: DeclarationId(3099), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90958,7 +90977,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590), }); declarations.push(Declaration { - id: DeclarationId(3099), + id: DeclarationId(3100), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90972,17 +90991,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590), }); declarations.push(Declaration { - id: DeclarationId(3100), + id: DeclarationId(3101), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3098), + ty: DeclarationId(3099), }, Field { label: "None".to_string(), - ty: DeclarationId(3099), + ty: DeclarationId(3100), }, ], }, @@ -90997,7 +91016,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8583, 8590), }); declarations.push(Declaration { - id: DeclarationId(3101), + id: DeclarationId(3102), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91016,7 +91035,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608), }); declarations.push(Declaration { - id: DeclarationId(3102), + id: DeclarationId(3103), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91030,17 +91049,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608), }); declarations.push(Declaration { - id: DeclarationId(3103), + id: DeclarationId(3104), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3101), + ty: DeclarationId(3102), }, Field { label: "None".to_string(), - ty: DeclarationId(3102), + ty: DeclarationId(3103), }, ], }, @@ -91055,7 +91074,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8601, 8608), }); declarations.push(Declaration { - id: DeclarationId(3104), + id: DeclarationId(3105), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91074,7 +91093,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748), }); declarations.push(Declaration { - id: DeclarationId(3105), + id: DeclarationId(3106), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91088,17 +91107,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748), }); declarations.push(Declaration { - id: DeclarationId(3106), + id: DeclarationId(3107), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3104), + ty: DeclarationId(3105), }, Field { label: "None".to_string(), - ty: DeclarationId(3105), + ty: DeclarationId(3106), }, ], }, @@ -91113,7 +91132,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8741, 8748), }); declarations.push(Declaration { - id: DeclarationId(3107), + id: DeclarationId(3108), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91132,7 +91151,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766), }); declarations.push(Declaration { - id: DeclarationId(3108), + id: DeclarationId(3109), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91146,17 +91165,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766), }); declarations.push(Declaration { - id: DeclarationId(3109), + id: DeclarationId(3110), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3107), + ty: DeclarationId(3108), }, Field { label: "None".to_string(), - ty: DeclarationId(3108), + ty: DeclarationId(3109), }, ], }, @@ -91171,7 +91190,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8759, 8766), }); declarations.push(Declaration { - id: DeclarationId(3110), + id: DeclarationId(3111), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91190,7 +91209,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904), }); declarations.push(Declaration { - id: DeclarationId(3111), + id: DeclarationId(3112), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91204,17 +91223,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904), }); declarations.push(Declaration { - id: DeclarationId(3112), + id: DeclarationId(3113), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3110), + ty: DeclarationId(3111), }, Field { label: "None".to_string(), - ty: DeclarationId(3111), + ty: DeclarationId(3112), }, ], }, @@ -91229,7 +91248,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8897, 8904), }); declarations.push(Declaration { - id: DeclarationId(3113), + id: DeclarationId(3114), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91248,7 +91267,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997), }); declarations.push(Declaration { - id: DeclarationId(3114), + id: DeclarationId(3115), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91262,17 +91281,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997), }); declarations.push(Declaration { - id: DeclarationId(3115), + id: DeclarationId(3116), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3113), + ty: DeclarationId(3114), }, Field { label: "None".to_string(), - ty: DeclarationId(3114), + ty: DeclarationId(3115), }, ], }, @@ -91287,7 +91306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8990, 8997), }); declarations.push(Declaration { - id: DeclarationId(3116), + id: DeclarationId(3117), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91306,7 +91325,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730), }); declarations.push(Declaration { - id: DeclarationId(3117), + id: DeclarationId(3118), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91320,17 +91339,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730), }); declarations.push(Declaration { - id: DeclarationId(3118), + id: DeclarationId(3119), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3116), + ty: DeclarationId(3117), }, Field { label: "None".to_string(), - ty: DeclarationId(3117), + ty: DeclarationId(3118), }, ], }, @@ -91345,7 +91364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9695, 9730), }); declarations.push(Declaration { - id: DeclarationId(3119), + id: DeclarationId(3120), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91364,7 +91383,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938), }); declarations.push(Declaration { - id: DeclarationId(3120), + id: DeclarationId(3121), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91378,17 +91397,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938), }); declarations.push(Declaration { - id: DeclarationId(3121), + id: DeclarationId(3122), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3119), + ty: DeclarationId(3120), }, Field { label: "None".to_string(), - ty: DeclarationId(3120), + ty: DeclarationId(3121), }, ], }, @@ -91403,7 +91422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 9933, 9938), }); declarations.push(Declaration { - id: DeclarationId(3122), + id: DeclarationId(3123), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91422,7 +91441,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043), }); declarations.push(Declaration { - id: DeclarationId(3123), + id: DeclarationId(3124), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91436,17 +91455,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043), }); declarations.push(Declaration { - id: DeclarationId(3124), + id: DeclarationId(3125), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3122), + ty: DeclarationId(3123), }, Field { label: "None".to_string(), - ty: DeclarationId(3123), + ty: DeclarationId(3124), }, ], }, @@ -91461,7 +91480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10038, 10043), }); declarations.push(Declaration { - id: DeclarationId(3125), + id: DeclarationId(3126), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91480,7 +91499,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134), }); declarations.push(Declaration { - id: DeclarationId(3126), + id: DeclarationId(3127), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91494,17 +91513,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134), }); declarations.push(Declaration { - id: DeclarationId(3127), + id: DeclarationId(3128), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3125), + ty: DeclarationId(3126), }, Field { label: "None".to_string(), - ty: DeclarationId(3126), + ty: DeclarationId(3127), }, ], }, @@ -91519,7 +91538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10129, 10134), }); declarations.push(Declaration { - id: DeclarationId(3128), + id: DeclarationId(3129), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91538,7 +91557,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760), }); declarations.push(Declaration { - id: DeclarationId(3129), + id: DeclarationId(3130), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91552,17 +91571,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760), }); declarations.push(Declaration { - id: DeclarationId(3130), + id: DeclarationId(3131), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3128), + ty: DeclarationId(3129), }, Field { label: "None".to_string(), - ty: DeclarationId(3129), + ty: DeclarationId(3130), }, ], }, @@ -91577,7 +91596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10756, 10760), }); declarations.push(Declaration { - id: DeclarationId(3131), + id: DeclarationId(3132), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91596,7 +91615,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796), }); declarations.push(Declaration { - id: DeclarationId(3132), + id: DeclarationId(3133), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91610,17 +91629,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796), }); declarations.push(Declaration { - id: DeclarationId(3133), + id: DeclarationId(3134), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3131), + ty: DeclarationId(3132), }, Field { label: "None".to_string(), - ty: DeclarationId(3132), + ty: DeclarationId(3133), }, ], }, @@ -91635,7 +91654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10792, 10796), }); declarations.push(Declaration { - id: DeclarationId(3134), + id: DeclarationId(3135), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91654,7 +91673,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835), }); declarations.push(Declaration { - id: DeclarationId(3135), + id: DeclarationId(3136), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91668,17 +91687,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835), }); declarations.push(Declaration { - id: DeclarationId(3136), + id: DeclarationId(3137), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3134), + ty: DeclarationId(3135), }, Field { label: "None".to_string(), - ty: DeclarationId(3135), + ty: DeclarationId(3136), }, ], }, @@ -91693,7 +91712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 10828, 10835), }); declarations.push(Declaration { - id: DeclarationId(3137), + id: DeclarationId(3138), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91712,7 +91731,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811), }); declarations.push(Declaration { - id: DeclarationId(3138), + id: DeclarationId(3139), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91726,17 +91745,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811), }); declarations.push(Declaration { - id: DeclarationId(3139), + id: DeclarationId(3140), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3137), + ty: DeclarationId(3138), }, Field { label: "None".to_string(), - ty: DeclarationId(3138), + ty: DeclarationId(3139), }, ], }, @@ -91751,7 +91770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11804, 11811), }); declarations.push(Declaration { - id: DeclarationId(3140), + id: DeclarationId(3141), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91770,7 +91789,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877), }); declarations.push(Declaration { - id: DeclarationId(3141), + id: DeclarationId(3142), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91784,17 +91803,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877), }); declarations.push(Declaration { - id: DeclarationId(3142), + id: DeclarationId(3143), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3140), + ty: DeclarationId(3141), }, Field { label: "None".to_string(), - ty: DeclarationId(3141), + ty: DeclarationId(3142), }, ], }, @@ -91809,7 +91828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 11872, 11877), }); declarations.push(Declaration { - id: DeclarationId(3143), + id: DeclarationId(3144), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91828,7 +91847,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763), }); declarations.push(Declaration { - id: DeclarationId(3144), + id: DeclarationId(3145), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91842,17 +91861,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763), }); declarations.push(Declaration { - id: DeclarationId(3145), + id: DeclarationId(3146), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3143), + ty: DeclarationId(3144), }, Field { label: "None".to_string(), - ty: DeclarationId(3144), + ty: DeclarationId(3145), }, ], }, @@ -91867,7 +91886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2751, 2763), }); declarations.push(Declaration { - id: DeclarationId(3146), + id: DeclarationId(3147), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91886,7 +91905,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968), }); declarations.push(Declaration { - id: DeclarationId(3147), + id: DeclarationId(3148), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91900,17 +91919,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968), }); declarations.push(Declaration { - id: DeclarationId(3148), + id: DeclarationId(3149), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3146), + ty: DeclarationId(3147), }, Field { label: "None".to_string(), - ty: DeclarationId(3147), + ty: DeclarationId(3148), }, ], }, @@ -91925,7 +91944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2961, 2968), }); declarations.push(Declaration { - id: DeclarationId(3149), + id: DeclarationId(3150), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91944,7 +91963,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786), }); declarations.push(Declaration { - id: DeclarationId(3150), + id: DeclarationId(3151), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91958,17 +91977,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786), }); declarations.push(Declaration { - id: DeclarationId(3151), + id: DeclarationId(3152), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3149), + ty: DeclarationId(3150), }, Field { label: "None".to_string(), - ty: DeclarationId(3150), + ty: DeclarationId(3151), }, ], }, @@ -91983,7 +92002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5779, 5786), }); declarations.push(Declaration { - id: DeclarationId(3152), + id: DeclarationId(3153), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92002,7 +92021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714), }); declarations.push(Declaration { - id: DeclarationId(3153), + id: DeclarationId(3154), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92016,17 +92035,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714), }); declarations.push(Declaration { - id: DeclarationId(3154), + id: DeclarationId(3155), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3152), + ty: DeclarationId(3153), }, Field { label: "None".to_string(), - ty: DeclarationId(3153), + ty: DeclarationId(3154), }, ], }, @@ -92041,7 +92060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6710, 6714), }); declarations.push(Declaration { - id: DeclarationId(3155), + id: DeclarationId(3156), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92060,7 +92079,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780), }); declarations.push(Declaration { - id: DeclarationId(3156), + id: DeclarationId(3157), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92074,17 +92093,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780), }); declarations.push(Declaration { - id: DeclarationId(3157), + id: DeclarationId(3158), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3155), + ty: DeclarationId(3156), }, Field { label: "None".to_string(), - ty: DeclarationId(3156), + ty: DeclarationId(3157), }, ], }, @@ -92099,7 +92118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7761, 7780), }); declarations.push(Declaration { - id: DeclarationId(3158), + id: DeclarationId(3159), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92118,7 +92137,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345), }); declarations.push(Declaration { - id: DeclarationId(3159), + id: DeclarationId(3160), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92132,17 +92151,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345), }); declarations.push(Declaration { - id: DeclarationId(3160), + id: DeclarationId(3161), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3158), + ty: DeclarationId(3159), }, Field { label: "None".to_string(), - ty: DeclarationId(3159), + ty: DeclarationId(3160), }, ], }, @@ -92157,7 +92176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8326, 8345), }); declarations.push(Declaration { - id: DeclarationId(3161), + id: DeclarationId(3162), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92176,7 +92195,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872), }); declarations.push(Declaration { - id: DeclarationId(3162), + id: DeclarationId(3163), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92190,17 +92209,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872), }); declarations.push(Declaration { - id: DeclarationId(3163), + id: DeclarationId(3164), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3161), + ty: DeclarationId(3162), }, Field { label: "None".to_string(), - ty: DeclarationId(3162), + ty: DeclarationId(3163), }, ], }, @@ -92215,7 +92234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3859, 3872), }); declarations.push(Declaration { - id: DeclarationId(3164), + id: DeclarationId(3165), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92234,7 +92253,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3165), + id: DeclarationId(3166), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92248,17 +92267,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3166), + id: DeclarationId(3167), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3164), + ty: DeclarationId(3165), }, Field { label: "None".to_string(), - ty: DeclarationId(3165), + ty: DeclarationId(3166), }, ], }, @@ -92273,7 +92292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3167), + id: DeclarationId(3168), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92292,7 +92311,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3168), + id: DeclarationId(3169), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92306,17 +92325,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3169), + id: DeclarationId(3170), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3167), + ty: DeclarationId(3168), }, Field { label: "None".to_string(), - ty: DeclarationId(3168), + ty: DeclarationId(3169), }, ], }, @@ -92331,7 +92350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3170), + id: DeclarationId(3171), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92350,7 +92369,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3171), + id: DeclarationId(3172), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92364,17 +92383,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3172), + id: DeclarationId(3173), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3170), + ty: DeclarationId(3171), }, Field { label: "None".to_string(), - ty: DeclarationId(3171), + ty: DeclarationId(3172), }, ], }, @@ -92389,7 +92408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3173), + id: DeclarationId(3174), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92408,7 +92427,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3174), + id: DeclarationId(3175), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92422,17 +92441,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3175), + id: DeclarationId(3176), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3173), + ty: DeclarationId(3174), }, Field { label: "None".to_string(), - ty: DeclarationId(3174), + ty: DeclarationId(3175), }, ], }, @@ -92447,7 +92466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3176), + id: DeclarationId(3177), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92466,7 +92485,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3177), + id: DeclarationId(3178), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92480,17 +92499,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3178), + id: DeclarationId(3179), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3176), + ty: DeclarationId(3177), }, Field { label: "None".to_string(), - ty: DeclarationId(3177), + ty: DeclarationId(3178), }, ], }, @@ -92505,7 +92524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3179), + id: DeclarationId(3180), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92524,7 +92543,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3180), + id: DeclarationId(3181), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92538,17 +92557,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3181), + id: DeclarationId(3182), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3179), + ty: DeclarationId(3180), }, Field { label: "None".to_string(), - ty: DeclarationId(3180), + ty: DeclarationId(3181), }, ], }, @@ -92563,7 +92582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3182), + id: DeclarationId(3183), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92582,7 +92601,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3183), + id: DeclarationId(3184), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92596,17 +92615,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3184), + id: DeclarationId(3185), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3182), + ty: DeclarationId(3183), }, Field { label: "None".to_string(), - ty: DeclarationId(3183), + ty: DeclarationId(3184), }, ], }, @@ -92621,7 +92640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3185), + id: DeclarationId(3186), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92640,7 +92659,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3186), + id: DeclarationId(3187), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92654,17 +92673,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3187), + id: DeclarationId(3188), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3185), + ty: DeclarationId(3186), }, Field { label: "None".to_string(), - ty: DeclarationId(3186), + ty: DeclarationId(3187), }, ], }, @@ -92679,7 +92698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3188), + id: DeclarationId(3189), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92698,7 +92717,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3189), + id: DeclarationId(3190), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92712,17 +92731,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3190), + id: DeclarationId(3191), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3188), + ty: DeclarationId(3189), }, Field { label: "None".to_string(), - ty: DeclarationId(3189), + ty: DeclarationId(3190), }, ], }, @@ -92737,7 +92756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3191), + id: DeclarationId(3192), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92756,7 +92775,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3192), + id: DeclarationId(3193), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92770,17 +92789,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3193), + id: DeclarationId(3194), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3191), + ty: DeclarationId(3192), }, Field { label: "None".to_string(), - ty: DeclarationId(3192), + ty: DeclarationId(3193), }, ], }, @@ -92795,7 +92814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3194), + id: DeclarationId(3195), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92814,7 +92833,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3195), + id: DeclarationId(3196), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92828,17 +92847,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3196), + id: DeclarationId(3197), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3194), + ty: DeclarationId(3195), }, Field { label: "None".to_string(), - ty: DeclarationId(3195), + ty: DeclarationId(3196), }, ], }, @@ -92853,7 +92872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3197), + id: DeclarationId(3198), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92872,7 +92891,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3198), + id: DeclarationId(3199), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92886,17 +92905,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3199), + id: DeclarationId(3200), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3197), + ty: DeclarationId(3198), }, Field { label: "None".to_string(), - ty: DeclarationId(3198), + ty: DeclarationId(3199), }, ], }, @@ -92911,7 +92930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3200), + id: DeclarationId(3201), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92930,7 +92949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3201), + id: DeclarationId(3202), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92944,17 +92963,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3202), + id: DeclarationId(3203), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3200), + ty: DeclarationId(3201), }, Field { label: "None".to_string(), - ty: DeclarationId(3201), + ty: DeclarationId(3202), }, ], }, @@ -92969,7 +92988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3203), + id: DeclarationId(3204), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92988,7 +93007,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3204), + id: DeclarationId(3205), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93002,17 +93021,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3205), + id: DeclarationId(3206), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3203), + ty: DeclarationId(3204), }, Field { label: "None".to_string(), - ty: DeclarationId(3204), + ty: DeclarationId(3205), }, ], }, @@ -93027,7 +93046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3206), + id: DeclarationId(3207), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93046,7 +93065,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3207), + id: DeclarationId(3208), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93060,17 +93079,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3208), + id: DeclarationId(3209), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3206), + ty: DeclarationId(3207), }, Field { label: "None".to_string(), - ty: DeclarationId(3207), + ty: DeclarationId(3208), }, ], }, @@ -93085,7 +93104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3209), + id: DeclarationId(3210), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93104,7 +93123,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3210), + id: DeclarationId(3211), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93118,17 +93137,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3211), + id: DeclarationId(3212), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3209), + ty: DeclarationId(3210), }, Field { label: "None".to_string(), - ty: DeclarationId(3210), + ty: DeclarationId(3211), }, ], }, @@ -93143,7 +93162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3212), + id: DeclarationId(3213), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93162,7 +93181,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3213), + id: DeclarationId(3214), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93176,17 +93195,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3214), + id: DeclarationId(3215), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3212), + ty: DeclarationId(3213), }, Field { label: "None".to_string(), - ty: DeclarationId(3213), + ty: DeclarationId(3214), }, ], }, @@ -93201,7 +93220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3215), + id: DeclarationId(3216), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93220,7 +93239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3216), + id: DeclarationId(3217), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93234,17 +93253,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3217), + id: DeclarationId(3218), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3215), + ty: DeclarationId(3216), }, Field { label: "None".to_string(), - ty: DeclarationId(3216), + ty: DeclarationId(3217), }, ], }, @@ -93259,7 +93278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3218), + id: DeclarationId(3219), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93278,7 +93297,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3219), + id: DeclarationId(3220), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93292,17 +93311,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3220), + id: DeclarationId(3221), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3218), + ty: DeclarationId(3219), }, Field { label: "None".to_string(), - ty: DeclarationId(3219), + ty: DeclarationId(3220), }, ], }, @@ -93317,7 +93336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3221), + id: DeclarationId(3222), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93336,7 +93355,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3222), + id: DeclarationId(3223), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93350,17 +93369,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3223), + id: DeclarationId(3224), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3221), + ty: DeclarationId(3222), }, Field { label: "None".to_string(), - ty: DeclarationId(3222), + ty: DeclarationId(3223), }, ], }, @@ -93375,7 +93394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3224), + id: DeclarationId(3225), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93394,7 +93413,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3225), + id: DeclarationId(3226), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93408,17 +93427,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3226), + id: DeclarationId(3227), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3224), + ty: DeclarationId(3225), }, Field { label: "None".to_string(), - ty: DeclarationId(3225), + ty: DeclarationId(3226), }, ], }, @@ -93433,7 +93452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3227), + id: DeclarationId(3228), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93452,7 +93471,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574), }); declarations.push(Declaration { - id: DeclarationId(3228), + id: DeclarationId(3229), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93466,17 +93485,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574), }); declarations.push(Declaration { - id: DeclarationId(3229), + id: DeclarationId(3230), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3227), + ty: DeclarationId(3228), }, Field { label: "None".to_string(), - ty: DeclarationId(3228), + ty: DeclarationId(3229), }, ], }, @@ -93491,7 +93510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1558, 1574), }); declarations.push(Declaration { - id: DeclarationId(3230), + id: DeclarationId(3231), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93510,7 +93529,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710), }); declarations.push(Declaration { - id: DeclarationId(3231), + id: DeclarationId(3232), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93524,17 +93543,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710), }); declarations.push(Declaration { - id: DeclarationId(3232), + id: DeclarationId(3233), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3230), + ty: DeclarationId(3231), }, Field { label: "None".to_string(), - ty: DeclarationId(3231), + ty: DeclarationId(3232), }, ], }, @@ -93549,7 +93568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1690, 1710), }); declarations.push(Declaration { - id: DeclarationId(3233), + id: DeclarationId(3234), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93568,7 +93587,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746), }); declarations.push(Declaration { - id: DeclarationId(3234), + id: DeclarationId(3235), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93582,17 +93601,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746), }); declarations.push(Declaration { - id: DeclarationId(3235), + id: DeclarationId(3236), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3233), + ty: DeclarationId(3234), }, Field { label: "None".to_string(), - ty: DeclarationId(3234), + ty: DeclarationId(3235), }, ], }, @@ -93607,7 +93626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1726, 1746), }); declarations.push(Declaration { - id: DeclarationId(3236), + id: DeclarationId(3237), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93626,7 +93645,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512), }); declarations.push(Declaration { - id: DeclarationId(3237), + id: DeclarationId(3238), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93640,17 +93659,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512), }); declarations.push(Declaration { - id: DeclarationId(3238), + id: DeclarationId(3239), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3236), + ty: DeclarationId(3237), }, Field { label: "None".to_string(), - ty: DeclarationId(3237), + ty: DeclarationId(3238), }, ], }, @@ -93665,7 +93684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2505, 2512), }); declarations.push(Declaration { - id: DeclarationId(3239), + id: DeclarationId(3240), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93684,7 +93703,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548), }); declarations.push(Declaration { - id: DeclarationId(3240), + id: DeclarationId(3241), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93698,17 +93717,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548), }); declarations.push(Declaration { - id: DeclarationId(3241), + id: DeclarationId(3242), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3239), + ty: DeclarationId(3240), }, Field { label: "None".to_string(), - ty: DeclarationId(3240), + ty: DeclarationId(3241), }, ], }, @@ -93723,7 +93742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 2541, 2548), }); declarations.push(Declaration { - id: DeclarationId(3242), + id: DeclarationId(3243), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93742,7 +93761,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341), }); declarations.push(Declaration { - id: DeclarationId(3243), + id: DeclarationId(3244), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93756,17 +93775,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341), }); declarations.push(Declaration { - id: DeclarationId(3244), + id: DeclarationId(3245), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3242), + ty: DeclarationId(3243), }, Field { label: "None".to_string(), - ty: DeclarationId(3243), + ty: DeclarationId(3244), }, ], }, @@ -93781,7 +93800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5334, 5341), }); declarations.push(Declaration { - id: DeclarationId(3245), + id: DeclarationId(3246), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93800,7 +93819,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512), }); declarations.push(Declaration { - id: DeclarationId(3246), + id: DeclarationId(3247), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93814,17 +93833,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512), }); declarations.push(Declaration { - id: DeclarationId(3247), + id: DeclarationId(3248), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3245), + ty: DeclarationId(3246), }, Field { label: "None".to_string(), - ty: DeclarationId(3246), + ty: DeclarationId(3247), }, ], }, @@ -93839,7 +93858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5492, 5512), }); declarations.push(Declaration { - id: DeclarationId(3248), + id: DeclarationId(3249), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93858,7 +93877,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635), }); declarations.push(Declaration { - id: DeclarationId(3249), + id: DeclarationId(3250), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93872,17 +93891,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635), }); declarations.push(Declaration { - id: DeclarationId(3250), + id: DeclarationId(3251), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3248), + ty: DeclarationId(3249), }, Field { label: "None".to_string(), - ty: DeclarationId(3249), + ty: DeclarationId(3250), }, ], }, @@ -93897,7 +93916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5615, 5635), }); declarations.push(Declaration { - id: DeclarationId(3251), + id: DeclarationId(3252), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93916,7 +93935,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659), }); declarations.push(Declaration { - id: DeclarationId(3252), + id: DeclarationId(3253), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93930,17 +93949,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659), }); declarations.push(Declaration { - id: DeclarationId(3253), + id: DeclarationId(3254), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3251), + ty: DeclarationId(3252), }, Field { label: "None".to_string(), - ty: DeclarationId(3252), + ty: DeclarationId(3253), }, ], }, @@ -93955,7 +93974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5652, 5659), }); declarations.push(Declaration { - id: DeclarationId(3254), + id: DeclarationId(3255), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -93974,7 +93993,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687), }); declarations.push(Declaration { - id: DeclarationId(3255), + id: DeclarationId(3256), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -93988,17 +94007,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687), }); declarations.push(Declaration { - id: DeclarationId(3256), + id: DeclarationId(3257), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3254), + ty: DeclarationId(3255), }, Field { label: "None".to_string(), - ty: DeclarationId(3255), + ty: DeclarationId(3256), }, ], }, @@ -94013,7 +94032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5672, 5687), }); declarations.push(Declaration { - id: DeclarationId(3257), + id: DeclarationId(3258), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94032,7 +94051,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711), }); declarations.push(Declaration { - id: DeclarationId(3258), + id: DeclarationId(3259), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94046,17 +94065,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711), }); declarations.push(Declaration { - id: DeclarationId(3259), + id: DeclarationId(3260), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3257), + ty: DeclarationId(3258), }, Field { label: "None".to_string(), - ty: DeclarationId(3258), + ty: DeclarationId(3259), }, ], }, @@ -94071,7 +94090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5707, 5711), }); declarations.push(Declaration { - id: DeclarationId(3260), + id: DeclarationId(3261), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94090,7 +94109,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769), }); declarations.push(Declaration { - id: DeclarationId(3261), + id: DeclarationId(3262), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94104,17 +94123,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769), }); declarations.push(Declaration { - id: DeclarationId(3262), + id: DeclarationId(3263), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3260), + ty: DeclarationId(3261), }, Field { label: "None".to_string(), - ty: DeclarationId(3261), + ty: DeclarationId(3262), }, ], }, @@ -94129,7 +94148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5753, 5769), }); declarations.push(Declaration { - id: DeclarationId(3263), + id: DeclarationId(3264), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94148,7 +94167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447), }); declarations.push(Declaration { - id: DeclarationId(3264), + id: DeclarationId(3265), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94162,17 +94181,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447), }); declarations.push(Declaration { - id: DeclarationId(3265), + id: DeclarationId(3266), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3263), + ty: DeclarationId(3264), }, Field { label: "None".to_string(), - ty: DeclarationId(3264), + ty: DeclarationId(3265), }, ], }, @@ -94187,7 +94206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8418, 8447), }); declarations.push(Declaration { - id: DeclarationId(3266), + id: DeclarationId(3267), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94206,7 +94225,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636), }); declarations.push(Declaration { - id: DeclarationId(3267), + id: DeclarationId(3268), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94220,17 +94239,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636), }); declarations.push(Declaration { - id: DeclarationId(3268), + id: DeclarationId(3269), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3266), + ty: DeclarationId(3267), }, Field { label: "None".to_string(), - ty: DeclarationId(3267), + ty: DeclarationId(3268), }, ], }, @@ -94245,7 +94264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8615, 8636), }); declarations.push(Declaration { - id: DeclarationId(3269), + id: DeclarationId(3270), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94264,7 +94283,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839), }); declarations.push(Declaration { - id: DeclarationId(3270), + id: DeclarationId(3271), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94278,17 +94297,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839), }); declarations.push(Declaration { - id: DeclarationId(3271), + id: DeclarationId(3272), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3269), + ty: DeclarationId(3270), }, Field { label: "None".to_string(), - ty: DeclarationId(3270), + ty: DeclarationId(3271), }, ], }, @@ -94303,7 +94322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8834, 8839), }); declarations.push(Declaration { - id: DeclarationId(3272), + id: DeclarationId(3273), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94322,7 +94341,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539), }); declarations.push(Declaration { - id: DeclarationId(3273), + id: DeclarationId(3274), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94336,17 +94355,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539), }); declarations.push(Declaration { - id: DeclarationId(3274), + id: DeclarationId(3275), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3272), + ty: DeclarationId(3273), }, Field { label: "None".to_string(), - ty: DeclarationId(3273), + ty: DeclarationId(3274), }, ], }, @@ -94361,7 +94380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10532, 10539), }); declarations.push(Declaration { - id: DeclarationId(3275), + id: DeclarationId(3276), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94380,7 +94399,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558), }); declarations.push(Declaration { - id: DeclarationId(3276), + id: DeclarationId(3277), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94394,17 +94413,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558), }); declarations.push(Declaration { - id: DeclarationId(3277), + id: DeclarationId(3278), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3275), + ty: DeclarationId(3276), }, Field { label: "None".to_string(), - ty: DeclarationId(3276), + ty: DeclarationId(3277), }, ], }, @@ -94419,7 +94438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10551, 10558), }); declarations.push(Declaration { - id: DeclarationId(3278), + id: DeclarationId(3279), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94438,7 +94457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634), }); declarations.push(Declaration { - id: DeclarationId(3279), + id: DeclarationId(3280), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94452,17 +94471,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634), }); declarations.push(Declaration { - id: DeclarationId(3280), + id: DeclarationId(3281), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3278), + ty: DeclarationId(3279), }, Field { label: "None".to_string(), - ty: DeclarationId(3279), + ty: DeclarationId(3280), }, ], }, @@ -94477,7 +94496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10614, 10634), }); declarations.push(Declaration { - id: DeclarationId(3281), + id: DeclarationId(3282), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94496,7 +94515,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668), }); declarations.push(Declaration { - id: DeclarationId(3282), + id: DeclarationId(3283), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94510,17 +94529,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668), }); declarations.push(Declaration { - id: DeclarationId(3283), + id: DeclarationId(3284), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3281), + ty: DeclarationId(3282), }, Field { label: "None".to_string(), - ty: DeclarationId(3282), + ty: DeclarationId(3283), }, ], }, @@ -94535,7 +94554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10661, 10668), }); declarations.push(Declaration { - id: DeclarationId(3284), + id: DeclarationId(3285), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94554,7 +94573,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697), }); declarations.push(Declaration { - id: DeclarationId(3285), + id: DeclarationId(3286), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94568,17 +94587,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697), }); declarations.push(Declaration { - id: DeclarationId(3286), + id: DeclarationId(3287), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3284), + ty: DeclarationId(3285), }, Field { label: "None".to_string(), - ty: DeclarationId(3285), + ty: DeclarationId(3286), }, ], }, @@ -94593,7 +94612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10690, 10697), }); declarations.push(Declaration { - id: DeclarationId(3287), + id: DeclarationId(3288), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94612,7 +94631,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757), }); declarations.push(Declaration { - id: DeclarationId(3288), + id: DeclarationId(3289), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94626,17 +94645,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757), }); declarations.push(Declaration { - id: DeclarationId(3289), + id: DeclarationId(3290), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3287), + ty: DeclarationId(3288), }, Field { label: "None".to_string(), - ty: DeclarationId(3288), + ty: DeclarationId(3289), }, ], }, @@ -94651,7 +94670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10753, 10757), }); declarations.push(Declaration { - id: DeclarationId(3290), + id: DeclarationId(3291), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94670,7 +94689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798), }); declarations.push(Declaration { - id: DeclarationId(3291), + id: DeclarationId(3292), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94684,17 +94703,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798), }); declarations.push(Declaration { - id: DeclarationId(3292), + id: DeclarationId(3293), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3290), + ty: DeclarationId(3291), }, Field { label: "None".to_string(), - ty: DeclarationId(3291), + ty: DeclarationId(3292), }, ], }, @@ -94709,7 +94728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10791, 10798), }); declarations.push(Declaration { - id: DeclarationId(3293), + id: DeclarationId(3294), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94728,7 +94747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817), }); declarations.push(Declaration { - id: DeclarationId(3294), + id: DeclarationId(3295), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94742,17 +94761,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817), }); declarations.push(Declaration { - id: DeclarationId(3295), + id: DeclarationId(3296), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3293), + ty: DeclarationId(3294), }, Field { label: "None".to_string(), - ty: DeclarationId(3294), + ty: DeclarationId(3295), }, ], }, @@ -94767,12 +94786,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10810, 10817), }); declarations.push(Declaration { - id: DeclarationId(3296), + id: DeclarationId(3297), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "_0".to_string(), - ty: DeclarationId(2877), + ty: DeclarationId(2876), }], }, type_params: vec![], @@ -94783,10 +94802,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963), }); declarations.push(Declaration { - id: DeclarationId(3297), + id: DeclarationId(3298), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94797,20 +94816,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963), }); declarations.push(Declaration { - id: DeclarationId(3298), + id: DeclarationId(3299), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3296), + ty: DeclarationId(3297), }, Field { label: "None".to_string(), - ty: DeclarationId(3297), + ty: DeclarationId(3298), }, ], }, @@ -94822,10 +94841,68 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10886, 10906), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10943, 10963), }); declarations.push(Declaration { - id: DeclarationId(3299), + id: DeclarationId(3300), + name: None, + connective: TypeConnective::Conj { + children: vec![Field { + label: "_0".to_string(), + ty: DeclarationId(2878), + }], + }, + 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/github/actions.dag", 10976, 10996), + }); + declarations.push(Declaration { + id: DeclarationId(3301), + 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("dsl/extdeps/github/actions.dag", 10976, 10996), + }); + declarations.push(Declaration { + id: DeclarationId(3302), + name: None, + connective: TypeConnective::Disj { + variants: vec![ + Field { + label: "Some".to_string(), + ty: DeclarationId(3300), + }, + Field { + label: "None".to_string(), + ty: DeclarationId(3301), + }, + ], + }, + 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/github/actions.dag", 10976, 10996), + }); + declarations.push(Declaration { + id: DeclarationId(3303), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94841,10 +94918,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025), }); declarations.push(Declaration { - id: DeclarationId(3300), + id: DeclarationId(3304), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94855,20 +94932,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025), }); declarations.push(Declaration { - id: DeclarationId(3301), + id: DeclarationId(3305), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3299), + ty: DeclarationId(3303), }, Field { label: "None".to_string(), - ty: DeclarationId(3300), + ty: DeclarationId(3304), }, ], }, @@ -94880,10 +94957,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10928, 10935), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11018, 11025), }); declarations.push(Declaration { - id: DeclarationId(3302), + id: DeclarationId(3306), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94899,10 +94976,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085), }); declarations.push(Declaration { - id: DeclarationId(3303), + id: DeclarationId(3307), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94913,20 +94990,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085), }); declarations.push(Declaration { - id: DeclarationId(3304), + id: DeclarationId(3308), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3302), + ty: DeclarationId(3306), }, Field { label: "None".to_string(), - ty: DeclarationId(3303), + ty: DeclarationId(3307), }, ], }, @@ -94938,10 +95015,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 10991, 10995), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11081, 11085), }); declarations.push(Declaration { - id: DeclarationId(3305), + id: DeclarationId(3309), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -94957,10 +95034,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511), }); declarations.push(Declaration { - id: DeclarationId(3306), + id: DeclarationId(3310), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -94971,20 +95048,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511), }); declarations.push(Declaration { - id: DeclarationId(3307), + id: DeclarationId(3311), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3305), + ty: DeclarationId(3309), }, Field { label: "None".to_string(), - ty: DeclarationId(3306), + ty: DeclarationId(3310), }, ], }, @@ -94996,10 +95073,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11414, 11421), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11504, 11511), }); declarations.push(Declaration { - id: DeclarationId(3308), + id: DeclarationId(3312), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95015,10 +95092,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523), }); declarations.push(Declaration { - id: DeclarationId(3309), + id: DeclarationId(3313), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95029,20 +95106,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523), }); declarations.push(Declaration { - id: DeclarationId(3310), + id: DeclarationId(3314), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3308), + ty: DeclarationId(3312), }, Field { label: "None".to_string(), - ty: DeclarationId(3309), + ty: DeclarationId(3313), }, ], }, @@ -95054,10 +95131,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11429, 11433), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11519, 11523), }); declarations.push(Declaration { - id: DeclarationId(3311), + id: DeclarationId(3315), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95073,10 +95150,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534), }); declarations.push(Declaration { - id: DeclarationId(3312), + id: DeclarationId(3316), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95087,20 +95164,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534), }); declarations.push(Declaration { - id: DeclarationId(3313), + id: DeclarationId(3317), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3311), + ty: DeclarationId(3315), }, Field { label: "None".to_string(), - ty: DeclarationId(3312), + ty: DeclarationId(3316), }, ], }, @@ -95112,10 +95189,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11440, 11444), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11530, 11534), }); declarations.push(Declaration { - id: DeclarationId(3314), + id: DeclarationId(3318), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95131,10 +95208,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591), }); declarations.push(Declaration { - id: DeclarationId(3315), + id: DeclarationId(3319), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95145,20 +95222,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591), }); declarations.push(Declaration { - id: DeclarationId(3316), + id: DeclarationId(3320), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3314), + ty: DeclarationId(3318), }, Field { label: "None".to_string(), - ty: DeclarationId(3315), + ty: DeclarationId(3319), }, ], }, @@ -95170,10 +95247,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11494, 11501), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11584, 11591), }); declarations.push(Declaration { - id: DeclarationId(3317), + id: DeclarationId(3321), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95189,10 +95266,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), }); declarations.push(Declaration { - id: DeclarationId(3318), + id: DeclarationId(3322), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95203,20 +95280,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), }); declarations.push(Declaration { - id: DeclarationId(3319), + id: DeclarationId(3323), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3317), + ty: DeclarationId(3321), }, Field { label: "None".to_string(), - ty: DeclarationId(3318), + ty: DeclarationId(3322), }, ], }, @@ -95228,10 +95305,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11509, 11513), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), }); declarations.push(Declaration { - id: DeclarationId(3320), + id: DeclarationId(3324), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95247,10 +95324,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614), }); declarations.push(Declaration { - id: DeclarationId(3321), + id: DeclarationId(3325), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95261,20 +95338,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614), }); declarations.push(Declaration { - id: DeclarationId(3322), + id: DeclarationId(3326), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3320), + ty: DeclarationId(3324), }, Field { label: "None".to_string(), - ty: DeclarationId(3321), + ty: DeclarationId(3325), }, ], }, @@ -95286,10 +95363,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11520, 11524), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11610, 11614), }); declarations.push(Declaration { - id: DeclarationId(3323), + id: DeclarationId(3327), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95305,10 +95382,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670), }); declarations.push(Declaration { - id: DeclarationId(3324), + id: DeclarationId(3328), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95319,20 +95396,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670), }); declarations.push(Declaration { - id: DeclarationId(3325), + id: DeclarationId(3329), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3323), + ty: DeclarationId(3327), }, Field { label: "None".to_string(), - ty: DeclarationId(3324), + ty: DeclarationId(3328), }, ], }, @@ -95344,10 +95421,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11573, 11580), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11663, 11670), }); declarations.push(Declaration { - id: DeclarationId(3326), + id: DeclarationId(3330), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95363,10 +95440,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682), }); declarations.push(Declaration { - id: DeclarationId(3327), + id: DeclarationId(3331), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95377,20 +95454,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682), }); declarations.push(Declaration { - id: DeclarationId(3328), + id: DeclarationId(3332), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3326), + ty: DeclarationId(3330), }, Field { label: "None".to_string(), - ty: DeclarationId(3327), + ty: DeclarationId(3331), }, ], }, @@ -95402,10 +95479,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11588, 11592), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11678, 11682), }); declarations.push(Declaration { - id: DeclarationId(3329), + id: DeclarationId(3333), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95421,10 +95498,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693), }); declarations.push(Declaration { - id: DeclarationId(3330), + id: DeclarationId(3334), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95435,20 +95512,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693), }); declarations.push(Declaration { - id: DeclarationId(3331), + id: DeclarationId(3335), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3329), + ty: DeclarationId(3333), }, Field { label: "None".to_string(), - ty: DeclarationId(3330), + ty: DeclarationId(3334), }, ], }, @@ -95460,10 +95537,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11599, 11603), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 11689, 11693), }); declarations.push(Declaration { - id: DeclarationId(3332), + id: DeclarationId(3336), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95479,10 +95556,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677), }); declarations.push(Declaration { - id: DeclarationId(3333), + id: DeclarationId(3337), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95493,20 +95570,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677), }); declarations.push(Declaration { - id: DeclarationId(3334), + id: DeclarationId(3338), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3332), + ty: DeclarationId(3336), }, Field { label: "None".to_string(), - ty: DeclarationId(3333), + ty: DeclarationId(3337), }, ], }, @@ -95518,10 +95595,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12583, 12587), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12673, 12677), }); declarations.push(Declaration { - id: DeclarationId(3335), + id: DeclarationId(3339), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95537,10 +95614,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763), }); declarations.push(Declaration { - id: DeclarationId(3336), + id: DeclarationId(3340), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95551,20 +95628,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763), }); declarations.push(Declaration { - id: DeclarationId(3337), + id: DeclarationId(3341), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3335), + ty: DeclarationId(3339), }, Field { label: "None".to_string(), - ty: DeclarationId(3336), + ty: DeclarationId(3340), }, ], }, @@ -95576,10 +95653,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12666, 12673), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 12756, 12763), }); declarations.push(Declaration { - id: DeclarationId(3338), + id: DeclarationId(3342), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -95595,10 +95672,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407), }); declarations.push(Declaration { - id: DeclarationId(3339), + id: DeclarationId(3343), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -95609,20 +95686,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407), }); declarations.push(Declaration { - id: DeclarationId(3340), + id: DeclarationId(3344), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3338), + ty: DeclarationId(3342), }, Field { label: "None".to_string(), - ty: DeclarationId(3339), + ty: DeclarationId(3343), }, ], }, @@ -95634,7 +95711,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13313, 13317), + span: SourceSpan::new("dsl/extdeps/github/actions.dag", 13403, 13407), }); declarations } @@ -103826,144 +103903,145 @@ fn bootstrapped_fixture_dag_clusters() -> Vec { fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap { { let mut map = HashMap::new(); - map.insert(DeclarationId(389), DeclarationId(2929)); - map.insert(DeclarationId(391), DeclarationId(2932)); - map.insert(DeclarationId(423), DeclarationId(2935)); - map.insert(DeclarationId(426), DeclarationId(2938)); - map.insert(DeclarationId(471), DeclarationId(2941)); - map.insert(DeclarationId(472), DeclarationId(2944)); - map.insert(DeclarationId(473), DeclarationId(2947)); - map.insert(DeclarationId(513), DeclarationId(2950)); - map.insert(DeclarationId(515), DeclarationId(2953)); - map.insert(DeclarationId(516), DeclarationId(2956)); - map.insert(DeclarationId(539), DeclarationId(2959)); - map.insert(DeclarationId(582), DeclarationId(2962)); - map.insert(DeclarationId(602), DeclarationId(2965)); - map.insert(DeclarationId(603), DeclarationId(2968)); - map.insert(DeclarationId(605), DeclarationId(2971)); - map.insert(DeclarationId(608), DeclarationId(2974)); - map.insert(DeclarationId(613), DeclarationId(2977)); - map.insert(DeclarationId(614), DeclarationId(2980)); - map.insert(DeclarationId(618), DeclarationId(2983)); - map.insert(DeclarationId(619), DeclarationId(2986)); - map.insert(DeclarationId(620), DeclarationId(2989)); - map.insert(DeclarationId(625), DeclarationId(2992)); - map.insert(DeclarationId(1818), DeclarationId(2995)); - map.insert(DeclarationId(1822), DeclarationId(2998)); - map.insert(DeclarationId(1825), DeclarationId(3001)); - map.insert(DeclarationId(1827), DeclarationId(3004)); - map.insert(DeclarationId(1828), DeclarationId(3007)); - map.insert(DeclarationId(1829), DeclarationId(3010)); - map.insert(DeclarationId(1883), DeclarationId(3013)); - map.insert(DeclarationId(1884), DeclarationId(3016)); - map.insert(DeclarationId(1885), DeclarationId(3019)); - map.insert(DeclarationId(1886), DeclarationId(3022)); - map.insert(DeclarationId(1887), DeclarationId(3025)); - map.insert(DeclarationId(1888), DeclarationId(3028)); - map.insert(DeclarationId(1894), DeclarationId(3031)); - map.insert(DeclarationId(1949), DeclarationId(3034)); - map.insert(DeclarationId(1952), DeclarationId(3037)); - map.insert(DeclarationId(1953), DeclarationId(3040)); - map.insert(DeclarationId(1954), DeclarationId(3043)); - map.insert(DeclarationId(1955), DeclarationId(3046)); - map.insert(DeclarationId(1978), DeclarationId(3049)); - map.insert(DeclarationId(1983), DeclarationId(3052)); - map.insert(DeclarationId(1987), DeclarationId(3055)); - map.insert(DeclarationId(1990), DeclarationId(3058)); - map.insert(DeclarationId(1991), DeclarationId(3061)); - map.insert(DeclarationId(2036), DeclarationId(3064)); - map.insert(DeclarationId(2037), DeclarationId(3067)); - map.insert(DeclarationId(2038), DeclarationId(3070)); - map.insert(DeclarationId(2039), DeclarationId(3073)); - map.insert(DeclarationId(2089), DeclarationId(3076)); - map.insert(DeclarationId(2090), DeclarationId(3079)); - map.insert(DeclarationId(2109), DeclarationId(3082)); - map.insert(DeclarationId(2110), DeclarationId(3085)); - map.insert(DeclarationId(2114), DeclarationId(3088)); - map.insert(DeclarationId(2115), DeclarationId(3091)); - map.insert(DeclarationId(2126), DeclarationId(3094)); - map.insert(DeclarationId(2127), DeclarationId(3097)); - map.insert(DeclarationId(2129), DeclarationId(3100)); - map.insert(DeclarationId(2130), DeclarationId(3103)); - map.insert(DeclarationId(2132), DeclarationId(3106)); - map.insert(DeclarationId(2133), DeclarationId(3109)); - map.insert(DeclarationId(2135), DeclarationId(3112)); - map.insert(DeclarationId(2137), DeclarationId(3115)); - map.insert(DeclarationId(2140), DeclarationId(3118)); - map.insert(DeclarationId(2144), DeclarationId(3121)); - map.insert(DeclarationId(2146), DeclarationId(3124)); - map.insert(DeclarationId(2148), DeclarationId(3127)); - map.insert(DeclarationId(2158), DeclarationId(3130)); - map.insert(DeclarationId(2159), DeclarationId(3133)); - map.insert(DeclarationId(2160), DeclarationId(3136)); - map.insert(DeclarationId(2163), DeclarationId(3139)); - map.insert(DeclarationId(2164), DeclarationId(3142)); - map.insert(DeclarationId(2199), DeclarationId(3145)); - map.insert(DeclarationId(2200), DeclarationId(3148)); - map.insert(DeclarationId(2201), DeclarationId(3151)); - map.insert(DeclarationId(2202), DeclarationId(3154)); - map.insert(DeclarationId(2203), DeclarationId(3157)); - map.insert(DeclarationId(2204), DeclarationId(3160)); - map.insert(DeclarationId(2227), DeclarationId(3163)); - map.insert(DeclarationId(2357), DeclarationId(3166)); - map.insert(DeclarationId(2358), DeclarationId(3169)); - map.insert(DeclarationId(2364), DeclarationId(3172)); - map.insert(DeclarationId(2365), DeclarationId(3175)); - map.insert(DeclarationId(2366), DeclarationId(3178)); - map.insert(DeclarationId(2367), DeclarationId(3181)); - map.insert(DeclarationId(2368), DeclarationId(3184)); - map.insert(DeclarationId(2369), DeclarationId(3187)); - map.insert(DeclarationId(2419), DeclarationId(3190)); - map.insert(DeclarationId(2463), DeclarationId(3193)); - map.insert(DeclarationId(2471), DeclarationId(3196)); - map.insert(DeclarationId(2485), DeclarationId(3199)); - map.insert(DeclarationId(2488), DeclarationId(3202)); - map.insert(DeclarationId(2546), DeclarationId(3205)); - map.insert(DeclarationId(2547), DeclarationId(3208)); - map.insert(DeclarationId(2548), DeclarationId(3211)); - map.insert(DeclarationId(2551), DeclarationId(3214)); - map.insert(DeclarationId(2552), DeclarationId(3217)); - map.insert(DeclarationId(2762), DeclarationId(3220)); - map.insert(DeclarationId(2791), DeclarationId(3223)); - map.insert(DeclarationId(2797), DeclarationId(3226)); - map.insert(DeclarationId(2802), DeclarationId(3229)); - map.insert(DeclarationId(2805), DeclarationId(3232)); - map.insert(DeclarationId(2806), DeclarationId(3235)); - map.insert(DeclarationId(2826), DeclarationId(3238)); - map.insert(DeclarationId(2827), DeclarationId(3241)); - map.insert(DeclarationId(2835), DeclarationId(3244)); - map.insert(DeclarationId(2839), DeclarationId(3247)); - map.insert(DeclarationId(2841), DeclarationId(3250)); - map.insert(DeclarationId(2842), DeclarationId(3253)); - map.insert(DeclarationId(2843), DeclarationId(3256)); - map.insert(DeclarationId(2844), DeclarationId(3259)); - map.insert(DeclarationId(2845), DeclarationId(3262)); - map.insert(DeclarationId(2851), DeclarationId(3265)); - map.insert(DeclarationId(2853), DeclarationId(3268)); - map.insert(DeclarationId(2854), DeclarationId(3271)); - map.insert(DeclarationId(2866), DeclarationId(3274)); - map.insert(DeclarationId(2867), DeclarationId(3277)); - map.insert(DeclarationId(2869), DeclarationId(3280)); - map.insert(DeclarationId(2870), DeclarationId(3283)); - map.insert(DeclarationId(2871), DeclarationId(3286)); - map.insert(DeclarationId(2872), DeclarationId(3289)); - map.insert(DeclarationId(2874), DeclarationId(3292)); - map.insert(DeclarationId(2875), DeclarationId(3295)); - map.insert(DeclarationId(2878), DeclarationId(3298)); - map.insert(DeclarationId(2879), DeclarationId(3301)); - map.insert(DeclarationId(2880), DeclarationId(3304)); - map.insert(DeclarationId(2887), DeclarationId(3307)); - map.insert(DeclarationId(2888), DeclarationId(3310)); - map.insert(DeclarationId(2889), DeclarationId(3313)); - map.insert(DeclarationId(2891), DeclarationId(3316)); - map.insert(DeclarationId(2892), DeclarationId(3319)); - map.insert(DeclarationId(2893), DeclarationId(3322)); - map.insert(DeclarationId(2895), DeclarationId(3325)); - map.insert(DeclarationId(2896), DeclarationId(3328)); - map.insert(DeclarationId(2897), DeclarationId(3331)); - map.insert(DeclarationId(2904), DeclarationId(3334)); - map.insert(DeclarationId(2906), DeclarationId(3337)); - map.insert(DeclarationId(2917), DeclarationId(3340)); + map.insert(DeclarationId(389), DeclarationId(2930)); + map.insert(DeclarationId(391), DeclarationId(2933)); + map.insert(DeclarationId(423), DeclarationId(2936)); + map.insert(DeclarationId(426), DeclarationId(2939)); + map.insert(DeclarationId(471), DeclarationId(2942)); + map.insert(DeclarationId(472), DeclarationId(2945)); + map.insert(DeclarationId(473), DeclarationId(2948)); + map.insert(DeclarationId(513), DeclarationId(2951)); + map.insert(DeclarationId(515), DeclarationId(2954)); + map.insert(DeclarationId(516), DeclarationId(2957)); + map.insert(DeclarationId(539), DeclarationId(2960)); + map.insert(DeclarationId(582), DeclarationId(2963)); + map.insert(DeclarationId(602), DeclarationId(2966)); + map.insert(DeclarationId(603), DeclarationId(2969)); + map.insert(DeclarationId(605), DeclarationId(2972)); + map.insert(DeclarationId(608), DeclarationId(2975)); + map.insert(DeclarationId(613), DeclarationId(2978)); + map.insert(DeclarationId(614), DeclarationId(2981)); + map.insert(DeclarationId(618), DeclarationId(2984)); + map.insert(DeclarationId(619), DeclarationId(2987)); + map.insert(DeclarationId(620), DeclarationId(2990)); + map.insert(DeclarationId(625), DeclarationId(2993)); + map.insert(DeclarationId(1818), DeclarationId(2996)); + map.insert(DeclarationId(1822), DeclarationId(2999)); + map.insert(DeclarationId(1825), DeclarationId(3002)); + map.insert(DeclarationId(1827), DeclarationId(3005)); + map.insert(DeclarationId(1828), DeclarationId(3008)); + map.insert(DeclarationId(1829), DeclarationId(3011)); + map.insert(DeclarationId(1883), DeclarationId(3014)); + map.insert(DeclarationId(1884), DeclarationId(3017)); + map.insert(DeclarationId(1885), DeclarationId(3020)); + map.insert(DeclarationId(1886), DeclarationId(3023)); + map.insert(DeclarationId(1887), DeclarationId(3026)); + map.insert(DeclarationId(1888), DeclarationId(3029)); + map.insert(DeclarationId(1894), DeclarationId(3032)); + map.insert(DeclarationId(1949), DeclarationId(3035)); + map.insert(DeclarationId(1952), DeclarationId(3038)); + map.insert(DeclarationId(1953), DeclarationId(3041)); + map.insert(DeclarationId(1954), DeclarationId(3044)); + map.insert(DeclarationId(1955), DeclarationId(3047)); + map.insert(DeclarationId(1978), DeclarationId(3050)); + map.insert(DeclarationId(1983), DeclarationId(3053)); + map.insert(DeclarationId(1987), DeclarationId(3056)); + map.insert(DeclarationId(1990), DeclarationId(3059)); + map.insert(DeclarationId(1991), DeclarationId(3062)); + map.insert(DeclarationId(2036), DeclarationId(3065)); + map.insert(DeclarationId(2037), DeclarationId(3068)); + map.insert(DeclarationId(2038), DeclarationId(3071)); + map.insert(DeclarationId(2039), DeclarationId(3074)); + map.insert(DeclarationId(2089), DeclarationId(3077)); + map.insert(DeclarationId(2090), DeclarationId(3080)); + map.insert(DeclarationId(2109), DeclarationId(3083)); + map.insert(DeclarationId(2110), DeclarationId(3086)); + map.insert(DeclarationId(2114), DeclarationId(3089)); + map.insert(DeclarationId(2115), DeclarationId(3092)); + map.insert(DeclarationId(2126), DeclarationId(3095)); + map.insert(DeclarationId(2127), DeclarationId(3098)); + map.insert(DeclarationId(2129), DeclarationId(3101)); + map.insert(DeclarationId(2130), DeclarationId(3104)); + map.insert(DeclarationId(2132), DeclarationId(3107)); + map.insert(DeclarationId(2133), DeclarationId(3110)); + map.insert(DeclarationId(2135), DeclarationId(3113)); + map.insert(DeclarationId(2137), DeclarationId(3116)); + map.insert(DeclarationId(2140), DeclarationId(3119)); + map.insert(DeclarationId(2144), DeclarationId(3122)); + map.insert(DeclarationId(2146), DeclarationId(3125)); + map.insert(DeclarationId(2148), DeclarationId(3128)); + map.insert(DeclarationId(2158), DeclarationId(3131)); + map.insert(DeclarationId(2159), DeclarationId(3134)); + map.insert(DeclarationId(2160), DeclarationId(3137)); + map.insert(DeclarationId(2163), DeclarationId(3140)); + map.insert(DeclarationId(2164), DeclarationId(3143)); + map.insert(DeclarationId(2199), DeclarationId(3146)); + map.insert(DeclarationId(2200), DeclarationId(3149)); + map.insert(DeclarationId(2201), DeclarationId(3152)); + map.insert(DeclarationId(2202), DeclarationId(3155)); + map.insert(DeclarationId(2203), DeclarationId(3158)); + map.insert(DeclarationId(2204), DeclarationId(3161)); + map.insert(DeclarationId(2227), DeclarationId(3164)); + map.insert(DeclarationId(2357), DeclarationId(3167)); + map.insert(DeclarationId(2358), DeclarationId(3170)); + map.insert(DeclarationId(2364), DeclarationId(3173)); + map.insert(DeclarationId(2365), DeclarationId(3176)); + map.insert(DeclarationId(2366), DeclarationId(3179)); + map.insert(DeclarationId(2367), DeclarationId(3182)); + map.insert(DeclarationId(2368), DeclarationId(3185)); + map.insert(DeclarationId(2369), DeclarationId(3188)); + map.insert(DeclarationId(2419), DeclarationId(3191)); + map.insert(DeclarationId(2463), DeclarationId(3194)); + map.insert(DeclarationId(2471), DeclarationId(3197)); + map.insert(DeclarationId(2485), DeclarationId(3200)); + map.insert(DeclarationId(2488), DeclarationId(3203)); + map.insert(DeclarationId(2546), DeclarationId(3206)); + map.insert(DeclarationId(2547), DeclarationId(3209)); + map.insert(DeclarationId(2548), DeclarationId(3212)); + map.insert(DeclarationId(2551), DeclarationId(3215)); + map.insert(DeclarationId(2552), DeclarationId(3218)); + map.insert(DeclarationId(2762), DeclarationId(3221)); + map.insert(DeclarationId(2791), DeclarationId(3224)); + map.insert(DeclarationId(2797), DeclarationId(3227)); + map.insert(DeclarationId(2802), DeclarationId(3230)); + map.insert(DeclarationId(2805), DeclarationId(3233)); + map.insert(DeclarationId(2806), DeclarationId(3236)); + map.insert(DeclarationId(2826), DeclarationId(3239)); + map.insert(DeclarationId(2827), DeclarationId(3242)); + map.insert(DeclarationId(2835), DeclarationId(3245)); + map.insert(DeclarationId(2839), DeclarationId(3248)); + map.insert(DeclarationId(2841), DeclarationId(3251)); + map.insert(DeclarationId(2842), DeclarationId(3254)); + map.insert(DeclarationId(2843), DeclarationId(3257)); + map.insert(DeclarationId(2844), DeclarationId(3260)); + map.insert(DeclarationId(2845), DeclarationId(3263)); + map.insert(DeclarationId(2851), DeclarationId(3266)); + map.insert(DeclarationId(2853), DeclarationId(3269)); + map.insert(DeclarationId(2854), DeclarationId(3272)); + map.insert(DeclarationId(2866), DeclarationId(3275)); + map.insert(DeclarationId(2867), DeclarationId(3278)); + map.insert(DeclarationId(2869), DeclarationId(3281)); + map.insert(DeclarationId(2870), DeclarationId(3284)); + map.insert(DeclarationId(2871), DeclarationId(3287)); + map.insert(DeclarationId(2872), DeclarationId(3290)); + map.insert(DeclarationId(2874), DeclarationId(3293)); + map.insert(DeclarationId(2875), DeclarationId(3296)); + map.insert(DeclarationId(2877), DeclarationId(3299)); + map.insert(DeclarationId(2879), DeclarationId(3302)); + map.insert(DeclarationId(2880), DeclarationId(3305)); + map.insert(DeclarationId(2881), DeclarationId(3308)); + map.insert(DeclarationId(2888), DeclarationId(3311)); + map.insert(DeclarationId(2889), DeclarationId(3314)); + map.insert(DeclarationId(2890), DeclarationId(3317)); + map.insert(DeclarationId(2892), DeclarationId(3320)); + map.insert(DeclarationId(2893), DeclarationId(3323)); + map.insert(DeclarationId(2894), DeclarationId(3326)); + map.insert(DeclarationId(2896), DeclarationId(3329)); + map.insert(DeclarationId(2897), DeclarationId(3332)); + map.insert(DeclarationId(2898), DeclarationId(3335)); + map.insert(DeclarationId(2905), DeclarationId(3338)); + map.insert(DeclarationId(2907), DeclarationId(3341)); + map.insert(DeclarationId(2918), DeclarationId(3344)); map } } 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 727b21eef58..246fb6c2973 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: 854, - next_declaration_id: 2870, + next_declaration_id: 2874, next_port_id: 1021, primitives: PrimitiveCache::default(), substrate_markers: SubstrateMarkers::default(), @@ -24,7 +24,7 @@ pub(crate) fn bootstrapped_fixture_without_parse_surface_dag() -> Dag { emit_model_variants: EmitModelVariants::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: 2870, + declaration_append_begin_after_bootstrap: 2874, } } @@ -6302,28 +6302,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(676), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3115, 3143), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3147, 3175), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(557), target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(673), PortId(676)], output: PortId(677), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3091, 3144), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3123, 3176), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(558), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(678), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3180, 3208), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3212, 3240), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(559), target: TransformTarget::Callable(DeclarationId(2069)), inputs: vec![PortId(678)], output: PortId(679), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3171, 3209), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3203, 3241), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(560), @@ -6332,21 +6332,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(680)], output: PortId(681), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3235, 3243), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3267, 3275), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(561), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(682), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3258, 3286), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3290, 3318), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(562), target: TransformTarget::Callable(DeclarationId(2070)), inputs: vec![PortId(682)], output: PortId(683), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3249, 3287), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3281, 3319), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(563), @@ -6359,8 +6359,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3155, - 3167, + 3187, + 3199, ), }, binding: None, @@ -6372,8 +6372,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3218, - 3245, + 3250, + 3277, ), }, binding: Some(PayloadBinding { @@ -6383,7 +6383,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, ], output: PortId(684), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 3295), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3117, 3327), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6391,28 +6391,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(686), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3352, 3380), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3384, 3412), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(565), target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(673), PortId(686)], output: PortId(687), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3328, 3381), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3360, 3413), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(566), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(688), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3417, 3445), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3449, 3477), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(567), target: TransformTarget::Callable(DeclarationId(2071)), inputs: vec![PortId(688)], output: PortId(689), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3408, 3446), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3440, 3478), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(568), @@ -6421,21 +6421,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(690)], output: PortId(691), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3472, 3480), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3504, 3512), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(569), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(692), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3495, 3523), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3527, 3555), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(570), target: TransformTarget::Callable(DeclarationId(2072)), inputs: vec![PortId(692)], output: PortId(693), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3486, 3524), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3518, 3556), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(571), @@ -6448,8 +6448,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3392, - 3404, + 3424, + 3436, ), }, binding: None, @@ -6461,8 +6461,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3455, - 3482, + 3487, + 3514, ), }, binding: Some(PayloadBinding { @@ -6472,7 +6472,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, ], output: PortId(694), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3322, 3532), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3354, 3564), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6480,28 +6480,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(696), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3586, 3614), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3618, 3646), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(573), target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(673), PortId(696)], output: PortId(697), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3562, 3615), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3594, 3647), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(574), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(698), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3651, 3679), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3683, 3711), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(575), target: TransformTarget::Callable(DeclarationId(2073)), inputs: vec![PortId(698)], output: PortId(699), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3642, 3680), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3674, 3712), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(576), @@ -6510,21 +6510,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(700)], output: PortId(701), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3706, 3714), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3738, 3746), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(577), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(702), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3729, 3757), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3761, 3789), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(578), target: TransformTarget::Callable(DeclarationId(2074)), inputs: vec![PortId(702)], output: PortId(703), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3720, 3758), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3752, 3790), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(579), @@ -6537,8 +6537,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3626, - 3638, + 3658, + 3670, ), }, binding: None, @@ -6550,8 +6550,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3689, - 3716, + 3721, + 3748, ), }, binding: Some(PayloadBinding { @@ -6561,7 +6561,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, ], output: PortId(704), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3556, 3766), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3588, 3798), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6569,28 +6569,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(706), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3818, 3846), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3850, 3878), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(581), target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(673), PortId(706)], output: PortId(707), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3794, 3847), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3826, 3879), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(582), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(708), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3883, 3911), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3915, 3943), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(583), target: TransformTarget::Callable(DeclarationId(2075)), inputs: vec![PortId(708)], output: PortId(709), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3874, 3912), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3906, 3944), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(584), @@ -6599,21 +6599,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(710)], output: PortId(711), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3938, 3946), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3970, 3978), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(585), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(712), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3961, 3989), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3993, 4021), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(586), target: TransformTarget::Callable(DeclarationId(2076)), inputs: vec![PortId(712)], output: PortId(713), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3952, 3990), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3984, 4022), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(587), @@ -6626,8 +6626,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3858, - 3870, + 3890, + 3902, ), }, binding: None, @@ -6639,8 +6639,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3921, - 3948, + 3953, + 3980, ), }, binding: Some(PayloadBinding { @@ -6650,7 +6650,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, ], output: PortId(714), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3788, 3998), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3820, 4030), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Transform(TransformNode { @@ -6658,28 +6658,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(716), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4050, 4078), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4082, 4110), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(589), target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(673), PortId(716)], output: PortId(717), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4026, 4079), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4058, 4111), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(590), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(718), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4115, 4143), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4147, 4175), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(591), target: TransformTarget::Callable(DeclarationId(2077)), inputs: vec![PortId(718)], output: PortId(719), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4106, 4144), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4138, 4176), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(592), @@ -6688,21 +6688,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(720)], output: PortId(721), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4170, 4178), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4202, 4210), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(593), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(722), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4193, 4221), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4225, 4253), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(594), target: TransformTarget::Callable(DeclarationId(2078)), inputs: vec![PortId(722)], output: PortId(723), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4184, 4222), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4216, 4254), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(595), @@ -6715,8 +6715,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 4090, - 4102, + 4122, + 4134, ), }, binding: None, @@ -6728,8 +6728,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 4153, - 4180, + 4185, + 4212, ), }, binding: Some(PayloadBinding { @@ -6739,7 +6739,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, ], output: PortId(724), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4020, 4230), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4052, 4262), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Branch(BranchNode { @@ -6753,8 +6753,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Value".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3067, - 3075, + 3099, + 3107, ), }, binding: Some(PayloadBinding { @@ -6769,8 +6769,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Transform".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3300, - 3312, + 3332, + 3344, ), }, binding: Some(PayloadBinding { @@ -6785,8 +6785,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Branch".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3537, - 3546, + 3569, + 3578, ), }, binding: Some(PayloadBinding { @@ -6801,8 +6801,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Loop".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 3771, - 3778, + 3803, + 3810, ), }, binding: Some(PayloadBinding { @@ -6817,8 +6817,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Bind".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 4003, - 4010, + 4035, + 4042, ), }, binding: Some(PayloadBinding { @@ -6828,7 +6828,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, ], output: PortId(725), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3053, 4234), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -6836,7 +6836,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "ci_demo_timing_read".to_string(), value: PortId(725), params: vec![PortId(673), PortId(674)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3053, 4234), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 3085, 4266), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6845,14 +6845,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1180)), inputs: vec![PortId(726), PortId(727)], output: PortId(728), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4625, 4650), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(599), name: "ci_wad_modeled_workflow_timing_witness".to_string(), value: PortId(728), params: vec![PortId(726), PortId(727)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4625, 4650), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4657, 4682), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6861,14 +6861,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2079)), inputs: vec![], output: PortId(729), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4908, 4913), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(601), name: "_ci_wad_seed_list_declaration_empty".to_string(), value: PortId(729), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4908, 4913), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4940, 4945), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6877,14 +6877,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2080)), inputs: vec![], output: PortId(730), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4973, 4978), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(603), name: "_ci_wad_seed_list_behavior_empty".to_string(), value: PortId(730), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 4973, 4978), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5005, 5010), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6893,14 +6893,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2081)), inputs: vec![], output: PortId(731), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5036, 5041), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(605), name: "_ci_wad_seed_list_dagport_empty".to_string(), value: PortId(731), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5036, 5041), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5068, 5073), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6909,14 +6909,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2082)), inputs: vec![], output: PortId(732), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5099, 5104), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(607), name: "_ci_wad_seed_list_cluster_empty".to_string(), value: PortId(732), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5099, 5104), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5131, 5136), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6925,14 +6925,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2083)), inputs: vec![], output: PortId(733), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5163, 5168), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(609), name: "_ci_wad_empty_list_diagnostic".to_string(), value: PortId(733), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5163, 5168), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5195, 5200), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6941,14 +6941,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2084)), inputs: vec![], output: PortId(734), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5243, 5248), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(611), name: "_ci_wad_empty_list_witness_tm".to_string(), value: PortId(734), params: vec![], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5243, 5248), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5275, 5280), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6957,28 +6957,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(2086)), inputs: vec![PortId(735)], output: PortId(736), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5359, 5370), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5391, 5402), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(613), target: TransformTarget::Callable(DeclarationId(1187)), inputs: vec![], output: PortId(737), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5409), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5410, 5441), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(614), target: TransformTarget::Callable(DeclarationId(2085)), inputs: vec![PortId(736), PortId(737)], output: PortId(738), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5411), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(615), name: "_ci_wad_witnesses_singleton_tm".to_string(), value: PortId(738), params: vec![PortId(735)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5346, 5411), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5378, 5443), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -6987,21 +6987,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1186)), inputs: vec![], output: PortId(740), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5512, 5543), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5544, 5575), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(617), target: TransformTarget::Callable(DeclarationId(2087)), inputs: vec![PortId(739), PortId(740)], output: PortId(741), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5487, 5545), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(618), name: "_ci_wad_violations_singleton".to_string(), value: PortId(741), params: vec![PortId(739)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5487, 5545), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5519, 5577), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7009,7 +7009,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(619), data: LiteralBits::String("ci_modeled_timing".to_string()), output: PortId(743), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5680, 5699), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5712, 5731), lane2_workflow: None, })); nodes.push(Behavior::Transform(TransformNode { @@ -7017,21 +7017,21 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1188)), inputs: vec![PortId(742)], output: PortId(744), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5733, 5766), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5765, 5798), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(621), target: TransformTarget::Callable(DeclarationId(2088)), inputs: vec![PortId(743), PortId(742), PortId(744)], output: PortId(745), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5646, 5771), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(622), name: "_ci_wad_dimension_ok_tm_payload".to_string(), value: PortId(745), params: vec![PortId(742)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5646, 5771), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5678, 5803), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7039,7 +7039,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { id: NodeId(623), data: LiteralBits::String("ci_modeled_timing".to_string()), output: PortId(748), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5928, 5947), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5960, 5979), lane2_workflow: None, })); nodes.push(Behavior::Transform(TransformNode { @@ -7047,28 +7047,28 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1189)), inputs: vec![PortId(747)], output: PortId(749), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5965, 5999), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5997, 6031), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(625), target: TransformTarget::Callable(DeclarationId(1188)), inputs: vec![PortId(746)], output: PortId(750), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6016, 6049), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6048, 6081), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(626), target: TransformTarget::Callable(DeclarationId(2089)), inputs: vec![PortId(748), PortId(749), PortId(750)], output: PortId(751), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5892, 6054), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086), })); nodes.push(Behavior::Bind(BindNode { id: NodeId(627), name: "_ci_wad_dimension_fail_tm_payload".to_string(), value: PortId(751), params: vec![PortId(746), PortId(747)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5892, 6054), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 5924, 6086), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7077,14 +7077,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1289)), inputs: vec![PortId(752)], output: PortId(754), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6417, 6434), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6449, 6466), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(629), target: TransformTarget::Callable(DeclarationId(1190)), inputs: vec![PortId(753)], output: PortId(755), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6450, 6484), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6482, 6516), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(630), @@ -7093,7 +7093,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(756)], output: PortId(757), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6496, 6504), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6528, 6536), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(631), @@ -7102,14 +7102,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(756)], output: PortId(758), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6506, 6514), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6538, 6546), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(632), target: TransformTarget::Callable(DeclarationId(1190)), inputs: vec![PortId(753)], output: PortId(759), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6520, 6554), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6552, 6586), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(633), @@ -7122,8 +7122,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Empty".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6441, - 6446, + 6473, + 6478, ), }, binding: None, @@ -7135,18 +7135,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Cons".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6489, - 6516, + 6521, + 6548, ), }, binding: Some(PayloadBinding { - binding_name: "__payload_6489_6516".to_string(), + binding_name: "__payload_6521_6548".to_string(), payload_port: PortId(756), }), }, ], output: PortId(760), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6411, 6558), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7154,7 +7154,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "report_dim_ok_tm".to_string(), value: PortId(760), params: vec![PortId(752), PortId(753)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6411, 6558), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6443, 6590), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7163,14 +7163,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1289)), inputs: vec![PortId(761)], output: PortId(764), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6678, 6695), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6710, 6727), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(636), target: TransformTarget::Callable(DeclarationId(1191)), inputs: vec![PortId(762), PortId(763)], output: PortId(765), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6711, 6753), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6743, 6785), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(637), @@ -7179,7 +7179,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(766)], output: PortId(767), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6765, 6773), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6797, 6805), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(638), @@ -7188,14 +7188,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(766)], output: PortId(768), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6775, 6783), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6807, 6815), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(639), target: TransformTarget::Callable(DeclarationId(1191)), inputs: vec![PortId(762), PortId(763)], output: PortId(769), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6789, 6831), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6821, 6863), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(640), @@ -7208,8 +7208,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Empty".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6702, - 6707, + 6734, + 6739, ), }, binding: None, @@ -7221,18 +7221,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Cons".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6758, - 6785, + 6790, + 6817, ), }, binding: Some(PayloadBinding { - binding_name: "__payload_6758_6785".to_string(), + binding_name: "__payload_6790_6817".to_string(), payload_port: PortId(766), }), }, ], output: PortId(770), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6672, 6835), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7240,7 +7240,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "report_dim_fail_tm".to_string(), value: PortId(770), params: vec![PortId(761), PortId(762), PortId(763)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6672, 6835), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6704, 6867), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7249,7 +7249,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1192)), inputs: vec![PortId(771), PortId(772)], output: PortId(774), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6993, 7015), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7025, 7047), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(643), @@ -7258,14 +7258,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(775)], output: PortId(776), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7037, 7048), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7069, 7080), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(644), target: TransformTarget::Callable(DeclarationId(1193)), inputs: vec![PortId(771), PortId(772), PortId(776)], output: PortId(777), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7054, 7084), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7086, 7116), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(645), @@ -7278,8 +7278,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "NoDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 6977, - 6989, + 7009, + 7021, ), }, binding: None, @@ -7291,8 +7291,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "SomeDiagnostic".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 7020, - 7050, + 7052, + 7082, ), }, binding: Some(PayloadBinding { @@ -7302,7 +7302,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, ], output: PortId(778), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6962, 7088), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7310,7 +7310,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "report_inhabits_branch_tm".to_string(), value: PortId(778), params: vec![PortId(771), PortId(772), PortId(773)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6962, 7088), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 6994, 7120), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7319,14 +7319,14 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1241)), inputs: vec![PortId(779), PortId(781)], output: PortId(782), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7268, 7294), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7300, 7326), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(648), target: TransformTarget::Callable(DeclarationId(1194)), inputs: vec![PortId(779), PortId(781), PortId(782)], output: PortId(783), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7236, 7295), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7268, 7327), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(649), @@ -7335,7 +7335,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(784)], output: PortId(785), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7311, 7320), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7343, 7352), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(650), @@ -7344,35 +7344,35 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { }, inputs: vec![PortId(784)], output: PortId(786), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7322, 7329), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7354, 7361), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(651), target: TransformTarget::Callable(DeclarationId(1232)), inputs: vec![], output: PortId(787), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7380, 7408), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7412, 7440), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(652), target: TransformTarget::Callable(DeclarationId(1235)), inputs: vec![PortId(786)], output: PortId(788), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7466, 7496), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7498, 7528), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(653), target: TransformTarget::Callable(DeclarationId(1236)), inputs: vec![PortId(785), PortId(788)], output: PortId(789), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7418, 7497), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7450, 7529), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(654), target: TransformTarget::Callable(DeclarationId(1193)), inputs: vec![PortId(779), PortId(787), PortId(789)], output: PortId(790), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7341, 7505), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7373, 7537), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(655), @@ -7385,8 +7385,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Inhabits".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 7221, - 7232, + 7253, + 7264, ), }, binding: Some(PayloadBinding { @@ -7401,18 +7401,18 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "Violates".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 7300, - 7331, + 7332, + 7363, ), }, binding: Some(PayloadBinding { - binding_name: "__payload_7300_7331".to_string(), + binding_name: "__payload_7332_7363".to_string(), payload_port: PortId(784), }), }, ], output: PortId(791), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7207, 7509), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541), emit_participation: Some(BranchEmitParticipation::UserMatch), })); nodes.push(Behavior::Bind(BindNode { @@ -7420,7 +7420,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "dimension_report_tm_from_witness".to_string(), value: PortId(791), params: vec![PortId(779), PortId(780)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7207, 7509), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 7239, 7541), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -7429,42 +7429,42 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { target: TransformTarget::Callable(DeclarationId(1289)), inputs: vec![PortId(792)], output: PortId(794), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8488, 8505), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8520, 8537), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(658), target: TransformTarget::Callable(DeclarationId(711)), inputs: vec![PortId(794)], output: PortId(795), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8479, 8506), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8511, 8538), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(659), target: TransformTarget::Callable(DeclarationId(1180)), inputs: vec![PortId(792), PortId(793)], output: PortId(796), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8552, 8577), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8584, 8609), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(660), target: TransformTarget::Callable(DeclarationId(1195)), inputs: vec![PortId(792), PortId(796)], output: PortId(797), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8516, 8578), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8548, 8610), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(661), target: TransformTarget::Callable(DeclarationId(1181)), inputs: vec![PortId(792), PortId(793)], output: PortId(798), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8626, 8670), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8658, 8702), })); nodes.push(Behavior::Transform(TransformNode { id: NodeId(662), target: TransformTarget::Callable(DeclarationId(1195)), inputs: vec![PortId(792), PortId(798)], output: PortId(799), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8590, 8671), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8622, 8703), })); nodes.push(Behavior::Branch(BranchNode { id: NodeId(663), @@ -7477,8 +7477,8 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "True".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 8516, - 8578, + 8548, + 8610, ), }, binding: None, @@ -7490,15 +7490,15 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "False".to_string(), span: SourceSpan::new( "src/v3/std/t_ci_workflow_as_data_demo.dag", - 8590, - 8671, + 8622, + 8703, ), }, binding: None, }, ], output: PortId(800), - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8476, 8671), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703), emit_participation: None, })); nodes.push(Behavior::Bind(BindNode { @@ -7506,7 +7506,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_nodes() -> Vec { name: "demo_ci_modeled_timing_dimension_report".to_string(), value: PortId(800), params: vec![PortId(792), PortId(793)], - span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8476, 8671), + span: SourceSpan::new("src/v3/std/t_ci_workflow_as_data_demo.dag", 8508, 8703), lane2_workflow: None, emit_participation: Some(BindEmitParticipation::UserCallable), })); @@ -9834,7 +9834,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(2870); + let mut declarations = Vec::with_capacity(2874); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -39220,11 +39220,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 Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec 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 { { let mut map = HashMap::new(); - map.insert(DeclarationId(389), DeclarationId(2473)); - map.insert(DeclarationId(391), DeclarationId(2476)); - map.insert(DeclarationId(423), DeclarationId(2479)); - map.insert(DeclarationId(426), DeclarationId(2482)); - map.insert(DeclarationId(471), DeclarationId(2485)); - map.insert(DeclarationId(472), DeclarationId(2488)); - map.insert(DeclarationId(473), DeclarationId(2491)); - map.insert(DeclarationId(513), DeclarationId(2494)); - map.insert(DeclarationId(515), DeclarationId(2497)); - map.insert(DeclarationId(516), DeclarationId(2500)); - map.insert(DeclarationId(539), DeclarationId(2503)); - map.insert(DeclarationId(582), DeclarationId(2506)); - map.insert(DeclarationId(602), DeclarationId(2509)); - map.insert(DeclarationId(603), DeclarationId(2512)); - map.insert(DeclarationId(605), DeclarationId(2515)); - map.insert(DeclarationId(608), DeclarationId(2518)); - map.insert(DeclarationId(613), DeclarationId(2521)); - map.insert(DeclarationId(614), DeclarationId(2524)); - map.insert(DeclarationId(618), DeclarationId(2527)); - map.insert(DeclarationId(619), DeclarationId(2530)); - map.insert(DeclarationId(620), DeclarationId(2533)); - map.insert(DeclarationId(625), DeclarationId(2536)); - map.insert(DeclarationId(1434), DeclarationId(2539)); - map.insert(DeclarationId(1438), DeclarationId(2542)); - map.insert(DeclarationId(1441), DeclarationId(2545)); - map.insert(DeclarationId(1443), DeclarationId(2548)); - map.insert(DeclarationId(1444), DeclarationId(2551)); - map.insert(DeclarationId(1445), DeclarationId(2554)); - map.insert(DeclarationId(1499), DeclarationId(2557)); - map.insert(DeclarationId(1500), DeclarationId(2560)); - map.insert(DeclarationId(1501), DeclarationId(2563)); - map.insert(DeclarationId(1502), DeclarationId(2566)); - map.insert(DeclarationId(1503), DeclarationId(2569)); - map.insert(DeclarationId(1504), DeclarationId(2572)); - map.insert(DeclarationId(1510), DeclarationId(2575)); - map.insert(DeclarationId(1565), DeclarationId(2578)); - map.insert(DeclarationId(1568), DeclarationId(2581)); - map.insert(DeclarationId(1569), DeclarationId(2584)); - map.insert(DeclarationId(1570), DeclarationId(2587)); - map.insert(DeclarationId(1571), DeclarationId(2590)); - map.insert(DeclarationId(1594), DeclarationId(2593)); - map.insert(DeclarationId(1599), DeclarationId(2596)); - map.insert(DeclarationId(1603), DeclarationId(2599)); - map.insert(DeclarationId(1606), DeclarationId(2602)); - map.insert(DeclarationId(1607), DeclarationId(2605)); - map.insert(DeclarationId(1652), DeclarationId(2608)); - map.insert(DeclarationId(1653), DeclarationId(2611)); - map.insert(DeclarationId(1654), DeclarationId(2614)); - map.insert(DeclarationId(1655), DeclarationId(2617)); - map.insert(DeclarationId(1705), DeclarationId(2620)); - map.insert(DeclarationId(1706), DeclarationId(2623)); - map.insert(DeclarationId(1725), DeclarationId(2626)); - map.insert(DeclarationId(1726), DeclarationId(2629)); - map.insert(DeclarationId(1730), DeclarationId(2632)); - map.insert(DeclarationId(1731), DeclarationId(2635)); - map.insert(DeclarationId(1742), DeclarationId(2638)); - map.insert(DeclarationId(1743), DeclarationId(2641)); - map.insert(DeclarationId(1745), DeclarationId(2644)); - map.insert(DeclarationId(1746), DeclarationId(2647)); - map.insert(DeclarationId(1748), DeclarationId(2650)); - map.insert(DeclarationId(1749), DeclarationId(2653)); - map.insert(DeclarationId(1751), DeclarationId(2656)); - map.insert(DeclarationId(1753), DeclarationId(2659)); - map.insert(DeclarationId(1756), DeclarationId(2662)); - map.insert(DeclarationId(1760), DeclarationId(2665)); - map.insert(DeclarationId(1762), DeclarationId(2668)); - map.insert(DeclarationId(1764), DeclarationId(2671)); - map.insert(DeclarationId(1774), DeclarationId(2674)); - map.insert(DeclarationId(1775), DeclarationId(2677)); - map.insert(DeclarationId(1776), DeclarationId(2680)); - map.insert(DeclarationId(1779), DeclarationId(2683)); - map.insert(DeclarationId(1780), DeclarationId(2686)); - map.insert(DeclarationId(1815), DeclarationId(2689)); - map.insert(DeclarationId(1816), DeclarationId(2692)); - map.insert(DeclarationId(1817), DeclarationId(2695)); - map.insert(DeclarationId(1818), DeclarationId(2698)); - map.insert(DeclarationId(1819), DeclarationId(2701)); - map.insert(DeclarationId(1820), DeclarationId(2704)); - map.insert(DeclarationId(1843), DeclarationId(2707)); - map.insert(DeclarationId(1973), DeclarationId(2710)); - map.insert(DeclarationId(1974), DeclarationId(2713)); - map.insert(DeclarationId(1980), DeclarationId(2716)); - map.insert(DeclarationId(1981), DeclarationId(2719)); - map.insert(DeclarationId(1982), DeclarationId(2722)); - map.insert(DeclarationId(1983), DeclarationId(2725)); - map.insert(DeclarationId(1984), DeclarationId(2728)); - map.insert(DeclarationId(1985), DeclarationId(2731)); - map.insert(DeclarationId(2090), DeclarationId(2734)); - map.insert(DeclarationId(2091), DeclarationId(2737)); - map.insert(DeclarationId(2092), DeclarationId(2740)); - map.insert(DeclarationId(2095), DeclarationId(2743)); - map.insert(DeclarationId(2096), DeclarationId(2746)); - map.insert(DeclarationId(2306), DeclarationId(2749)); - map.insert(DeclarationId(2335), DeclarationId(2752)); - map.insert(DeclarationId(2341), DeclarationId(2755)); - map.insert(DeclarationId(2346), DeclarationId(2758)); - map.insert(DeclarationId(2349), DeclarationId(2761)); - map.insert(DeclarationId(2350), DeclarationId(2764)); - map.insert(DeclarationId(2370), DeclarationId(2767)); - map.insert(DeclarationId(2371), DeclarationId(2770)); - map.insert(DeclarationId(2379), DeclarationId(2773)); - map.insert(DeclarationId(2383), DeclarationId(2776)); - map.insert(DeclarationId(2385), DeclarationId(2779)); - map.insert(DeclarationId(2386), DeclarationId(2782)); - map.insert(DeclarationId(2387), DeclarationId(2785)); - map.insert(DeclarationId(2388), DeclarationId(2788)); - map.insert(DeclarationId(2389), DeclarationId(2791)); - map.insert(DeclarationId(2395), DeclarationId(2794)); - map.insert(DeclarationId(2397), DeclarationId(2797)); - map.insert(DeclarationId(2398), DeclarationId(2800)); - map.insert(DeclarationId(2410), DeclarationId(2803)); - map.insert(DeclarationId(2411), DeclarationId(2806)); - map.insert(DeclarationId(2413), DeclarationId(2809)); - map.insert(DeclarationId(2414), DeclarationId(2812)); - map.insert(DeclarationId(2415), DeclarationId(2815)); - map.insert(DeclarationId(2416), DeclarationId(2818)); - map.insert(DeclarationId(2418), DeclarationId(2821)); - map.insert(DeclarationId(2419), DeclarationId(2824)); - map.insert(DeclarationId(2422), DeclarationId(2827)); - map.insert(DeclarationId(2423), DeclarationId(2830)); - map.insert(DeclarationId(2424), DeclarationId(2833)); - map.insert(DeclarationId(2431), DeclarationId(2836)); - map.insert(DeclarationId(2432), DeclarationId(2839)); - map.insert(DeclarationId(2433), DeclarationId(2842)); - map.insert(DeclarationId(2435), DeclarationId(2845)); - map.insert(DeclarationId(2436), DeclarationId(2848)); - map.insert(DeclarationId(2437), DeclarationId(2851)); - map.insert(DeclarationId(2439), DeclarationId(2854)); - map.insert(DeclarationId(2440), DeclarationId(2857)); - map.insert(DeclarationId(2441), DeclarationId(2860)); - map.insert(DeclarationId(2448), DeclarationId(2863)); - map.insert(DeclarationId(2450), DeclarationId(2866)); - map.insert(DeclarationId(2461), DeclarationId(2869)); + map.insert(DeclarationId(389), DeclarationId(2474)); + map.insert(DeclarationId(391), DeclarationId(2477)); + map.insert(DeclarationId(423), DeclarationId(2480)); + map.insert(DeclarationId(426), DeclarationId(2483)); + map.insert(DeclarationId(471), DeclarationId(2486)); + map.insert(DeclarationId(472), DeclarationId(2489)); + map.insert(DeclarationId(473), DeclarationId(2492)); + map.insert(DeclarationId(513), DeclarationId(2495)); + map.insert(DeclarationId(515), DeclarationId(2498)); + map.insert(DeclarationId(516), DeclarationId(2501)); + map.insert(DeclarationId(539), DeclarationId(2504)); + map.insert(DeclarationId(582), DeclarationId(2507)); + map.insert(DeclarationId(602), DeclarationId(2510)); + map.insert(DeclarationId(603), DeclarationId(2513)); + map.insert(DeclarationId(605), DeclarationId(2516)); + map.insert(DeclarationId(608), DeclarationId(2519)); + map.insert(DeclarationId(613), DeclarationId(2522)); + map.insert(DeclarationId(614), DeclarationId(2525)); + map.insert(DeclarationId(618), DeclarationId(2528)); + map.insert(DeclarationId(619), DeclarationId(2531)); + map.insert(DeclarationId(620), DeclarationId(2534)); + map.insert(DeclarationId(625), DeclarationId(2537)); + map.insert(DeclarationId(1434), DeclarationId(2540)); + map.insert(DeclarationId(1438), DeclarationId(2543)); + map.insert(DeclarationId(1441), DeclarationId(2546)); + map.insert(DeclarationId(1443), DeclarationId(2549)); + map.insert(DeclarationId(1444), DeclarationId(2552)); + map.insert(DeclarationId(1445), DeclarationId(2555)); + map.insert(DeclarationId(1499), DeclarationId(2558)); + map.insert(DeclarationId(1500), DeclarationId(2561)); + map.insert(DeclarationId(1501), DeclarationId(2564)); + map.insert(DeclarationId(1502), DeclarationId(2567)); + map.insert(DeclarationId(1503), DeclarationId(2570)); + map.insert(DeclarationId(1504), DeclarationId(2573)); + map.insert(DeclarationId(1510), DeclarationId(2576)); + map.insert(DeclarationId(1565), DeclarationId(2579)); + map.insert(DeclarationId(1568), DeclarationId(2582)); + map.insert(DeclarationId(1569), DeclarationId(2585)); + map.insert(DeclarationId(1570), DeclarationId(2588)); + map.insert(DeclarationId(1571), DeclarationId(2591)); + map.insert(DeclarationId(1594), DeclarationId(2594)); + map.insert(DeclarationId(1599), DeclarationId(2597)); + map.insert(DeclarationId(1603), DeclarationId(2600)); + map.insert(DeclarationId(1606), DeclarationId(2603)); + map.insert(DeclarationId(1607), DeclarationId(2606)); + map.insert(DeclarationId(1652), DeclarationId(2609)); + map.insert(DeclarationId(1653), DeclarationId(2612)); + map.insert(DeclarationId(1654), DeclarationId(2615)); + map.insert(DeclarationId(1655), DeclarationId(2618)); + map.insert(DeclarationId(1705), DeclarationId(2621)); + map.insert(DeclarationId(1706), DeclarationId(2624)); + map.insert(DeclarationId(1725), DeclarationId(2627)); + map.insert(DeclarationId(1726), DeclarationId(2630)); + map.insert(DeclarationId(1730), DeclarationId(2633)); + map.insert(DeclarationId(1731), DeclarationId(2636)); + map.insert(DeclarationId(1742), DeclarationId(2639)); + map.insert(DeclarationId(1743), DeclarationId(2642)); + map.insert(DeclarationId(1745), DeclarationId(2645)); + map.insert(DeclarationId(1746), DeclarationId(2648)); + map.insert(DeclarationId(1748), DeclarationId(2651)); + map.insert(DeclarationId(1749), DeclarationId(2654)); + map.insert(DeclarationId(1751), DeclarationId(2657)); + map.insert(DeclarationId(1753), DeclarationId(2660)); + map.insert(DeclarationId(1756), DeclarationId(2663)); + map.insert(DeclarationId(1760), DeclarationId(2666)); + map.insert(DeclarationId(1762), DeclarationId(2669)); + map.insert(DeclarationId(1764), DeclarationId(2672)); + map.insert(DeclarationId(1774), DeclarationId(2675)); + map.insert(DeclarationId(1775), DeclarationId(2678)); + map.insert(DeclarationId(1776), DeclarationId(2681)); + map.insert(DeclarationId(1779), DeclarationId(2684)); + map.insert(DeclarationId(1780), DeclarationId(2687)); + map.insert(DeclarationId(1815), DeclarationId(2690)); + map.insert(DeclarationId(1816), DeclarationId(2693)); + map.insert(DeclarationId(1817), DeclarationId(2696)); + map.insert(DeclarationId(1818), DeclarationId(2699)); + map.insert(DeclarationId(1819), DeclarationId(2702)); + map.insert(DeclarationId(1820), DeclarationId(2705)); + map.insert(DeclarationId(1843), DeclarationId(2708)); + map.insert(DeclarationId(1973), DeclarationId(2711)); + map.insert(DeclarationId(1974), DeclarationId(2714)); + map.insert(DeclarationId(1980), DeclarationId(2717)); + map.insert(DeclarationId(1981), DeclarationId(2720)); + map.insert(DeclarationId(1982), DeclarationId(2723)); + map.insert(DeclarationId(1983), DeclarationId(2726)); + map.insert(DeclarationId(1984), DeclarationId(2729)); + map.insert(DeclarationId(1985), DeclarationId(2732)); + map.insert(DeclarationId(2090), DeclarationId(2735)); + map.insert(DeclarationId(2091), DeclarationId(2738)); + map.insert(DeclarationId(2092), DeclarationId(2741)); + map.insert(DeclarationId(2095), DeclarationId(2744)); + map.insert(DeclarationId(2096), DeclarationId(2747)); + map.insert(DeclarationId(2306), DeclarationId(2750)); + map.insert(DeclarationId(2335), DeclarationId(2753)); + map.insert(DeclarationId(2341), DeclarationId(2756)); + map.insert(DeclarationId(2346), DeclarationId(2759)); + map.insert(DeclarationId(2349), DeclarationId(2762)); + map.insert(DeclarationId(2350), DeclarationId(2765)); + map.insert(DeclarationId(2370), DeclarationId(2768)); + map.insert(DeclarationId(2371), DeclarationId(2771)); + map.insert(DeclarationId(2379), DeclarationId(2774)); + map.insert(DeclarationId(2383), DeclarationId(2777)); + map.insert(DeclarationId(2385), DeclarationId(2780)); + map.insert(DeclarationId(2386), DeclarationId(2783)); + map.insert(DeclarationId(2387), DeclarationId(2786)); + map.insert(DeclarationId(2388), DeclarationId(2789)); + map.insert(DeclarationId(2389), DeclarationId(2792)); + map.insert(DeclarationId(2395), DeclarationId(2795)); + map.insert(DeclarationId(2397), DeclarationId(2798)); + map.insert(DeclarationId(2398), DeclarationId(2801)); + map.insert(DeclarationId(2410), DeclarationId(2804)); + map.insert(DeclarationId(2411), DeclarationId(2807)); + map.insert(DeclarationId(2413), DeclarationId(2810)); + map.insert(DeclarationId(2414), DeclarationId(2813)); + map.insert(DeclarationId(2415), DeclarationId(2816)); + map.insert(DeclarationId(2416), DeclarationId(2819)); + map.insert(DeclarationId(2418), DeclarationId(2822)); + map.insert(DeclarationId(2419), DeclarationId(2825)); + map.insert(DeclarationId(2421), DeclarationId(2828)); + map.insert(DeclarationId(2423), DeclarationId(2831)); + map.insert(DeclarationId(2424), DeclarationId(2834)); + map.insert(DeclarationId(2425), DeclarationId(2837)); + map.insert(DeclarationId(2432), DeclarationId(2840)); + map.insert(DeclarationId(2433), DeclarationId(2843)); + map.insert(DeclarationId(2434), DeclarationId(2846)); + map.insert(DeclarationId(2436), DeclarationId(2849)); + map.insert(DeclarationId(2437), DeclarationId(2852)); + map.insert(DeclarationId(2438), DeclarationId(2855)); + map.insert(DeclarationId(2440), DeclarationId(2858)); + map.insert(DeclarationId(2441), DeclarationId(2861)); + map.insert(DeclarationId(2442), DeclarationId(2864)); + map.insert(DeclarationId(2449), DeclarationId(2867)); + map.insert(DeclarationId(2451), DeclarationId(2870)); + map.insert(DeclarationId(2462), DeclarationId(2873)); map } } diff --git a/src/v3/compiler/src/parse_generated.rs b/src/v3/compiler/src/parse_generated.rs index f7c5ab3149d..181f3af1fe5 100644 --- a/src/v3/compiler/src/parse_generated.rs +++ b/src/v3/compiler/src/parse_generated.rs @@ -1545,6 +1545,13 @@ impl<'a> Parser<'a> { fn parse_primary(&mut self) -> Result { let peek = &self.peek().kind; + // Map literals share the `{` prefix with record literals. Top-level `data` + // disambiguates via `looks_like_map_literal` before `parse_record_literal`; + // mirror that here so nested `Map` fields (e.g. GitHub Actions + // `with:`) can use string keys like `"fetch-depth"`. + if matches!(peek, TokenKind::LBrace) && self.looks_like_map_literal() { + return self.parse_map_literal(); + } match primary_prefix_dispatch(peek) { Some(PrimaryPrefixDispatch::If) => return self.parse_if(), Some(PrimaryPrefixDispatch::Match) => return self.parse_match(), diff --git a/src/v3/compiler/tests/integration/t_ci_workflow_as_data_demo_test.rs b/src/v3/compiler/tests/integration/t_ci_workflow_as_data_demo_test.rs index c0fb39a77d1..26214866e3b 100644 --- a/src/v3/compiler/tests/integration/t_ci_workflow_as_data_demo_test.rs +++ b/src/v3/compiler/tests/integration/t_ci_workflow_as_data_demo_test.rs @@ -23,11 +23,16 @@ use v3_compiler::dag::{ use v3_compiler::evaluator::{ evaluate_body, EvalFrame, EvalStateStack, EvalStrategy, InputEvaluationOrder, NamedField, Value, }; -use v3_compiler::{compile_to_dag, generated_full_bootstrap_dag}; +use v3_compiler::{compile_to_dag, generated_full_bootstrap_dag, CompileError}; const DEMO_SPAN_FILE: &str = "src/v3/std/t_ci_workflow_as_data_demo.dag"; const GUNBC_CI_SOURCE: &str = include_str!("../../../../../dsl/gunbc/ci.dag"); const GUNBC_CI_FILE: &str = "dsl/gunbc/ci.dag"; +const GUNBC_CI_GITHUB_WORKFLOW_SOURCE: &str = + include_str!("../../../../../dsl/gunbc/ci_github_actions_workflow.dag"); +const GUNBC_CI_GITHUB_WORKFLOW_FILE: &str = "dsl/gunbc/ci_github_actions_workflow.dag"; +const GUNBC_CI_EMISSION_SOURCE: &str = include_str!("../../../../../dsl/gunbc/ci_emission.dag"); +const GUNBC_CI_EMISSION_FILE: &str = "dsl/gunbc/ci_emission.dag"; // P5 checkable receipt (parent gate #1956 / brief linkage — same pattern as `tc1_*_strict_fire_test`). const _: &str = include_str!(concat!( @@ -508,7 +513,72 @@ fn ci_workflow_as_data_demo_uses_only_gunbc_ci_authority_topology() { } #[test] -#[ignore = "hot-fix-2026-05-12 cold-v3-67min-reduction; rebuild via OnceLock/cached_compile amortization — owner: TBD per separate dispatch"] +fn gunbc_ci_github_actions_workflow_authority_compiles() { + let dag = match compile_to_dag( + GUNBC_CI_GITHUB_WORKFLOW_SOURCE, + GUNBC_CI_GITHUB_WORKFLOW_FILE, + ) { + Ok(d) => d, + Err(CompileError::Semantic(d)) => panic!( + "compile {GUNBC_CI_GITHUB_WORKFLOW_FILE}: {:?}", + d.diagnostics().iter().collect::>() + ), + Err(e) => panic!("compile {GUNBC_CI_GITHUB_WORKFLOW_FILE}: {e:?}"), + }; + assert!(dag.diagnostics().is_empty(), "{:?}", dag.diagnostics()); +} + +/// Mechanical source gate: `.github/workflows/ci.yml` is the YAML authority; the committed +/// `dsl/gunbc/ci_github_actions_workflow.dag` row must match the generator library output +/// byte-for-byte (same implementation as the `gen_gunbc_ci_workflow_dag` binary). +#[test] +fn gunbc_ci_github_actions_workflow_dag_matches_yaml_generator_output() { + use std::path::Path; + + let repo_root = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../.."); + let repo_root = repo_root + .canonicalize() + .unwrap_or_else(|e| panic!("canonicalize repo root {}: {e}", repo_root.display())); + let ci_yml = repo_root.join(".github/workflows/ci.yml"); + let dag_path = repo_root.join("dsl/gunbc/ci_github_actions_workflow.dag"); + assert!( + ci_yml.is_file(), + "missing {} (repo root {})", + ci_yml.display(), + repo_root.display() + ); + + let yaml = std::fs::read_to_string(&ci_yml) + .unwrap_or_else(|e| panic!("read {}: {e}", ci_yml.display())); + let expected = + std::fs::read(&dag_path).unwrap_or_else(|e| panic!("read {}: {e}", dag_path.display())); + + let fresh = gen_gunbc_ci_workflow_dag::emit_ci_github_actions_workflow_module( + ".github/workflows/ci.yml", + &yaml, + ) + .unwrap_or_else(|e| panic!("emit_ci_github_actions_workflow_module: {e}")); + + assert_eq!( + fresh.as_bytes(), + expected.as_slice(), + "`dsl/gunbc/ci_github_actions_workflow.dag` drifted from `.github/workflows/ci.yml`; regenerate with:\n CTRL_BUILD_WRAP_CARGO=0 cargo run -q -p gen_gunbc_ci_workflow_dag -- .github/workflows/ci.yml > dsl/gunbc/ci_github_actions_workflow.dag" + ); +} + +#[test] +fn gunbc_ci_emission_substrate_compiles() { + let dag = compile_to_dag(GUNBC_CI_EMISSION_SOURCE, GUNBC_CI_EMISSION_FILE) + .unwrap_or_else(|err| panic!("compile {GUNBC_CI_EMISSION_FILE}: {err:?}")); + assert!(dag.diagnostics().is_empty(), "{:?}", dag.diagnostics()); +} + +#[test] +// Deferred with explicit P5 anchor (not ad-hoc TBD): ROADMAP.md "Forward-Tracked Lane: T-Workflow-As-Data" +// (~L57ff) + timing-lens / `WorkflowObservationAnchor` thread (~L75ff, `docs/design-timing-lens.md` section 2). +// Dissolution: re-enable under default CI by amortizing this harness through `cached_compile_to_dag` +// (`tests/integration/common/cached_compile.rs`) / OnceLock so cold v3 (~67m full-bootstrap + evaluator) stays bounded. +#[ignore = "ROADMAP T-Workflow-As-Data lane + timing-lens anchor (ROADMAP.md ~L57, ~L75); cold v3 full-bootstrap+evaluator ~67m — dissolve via cached_compile_to_dag/OnceLock (tests/integration/common/cached_compile.rs); hot-fix 2026-05-12"] fn ci_workflow_as_data_demo_timing_dimension_report_evaluates_via_evaluator() { let dag = demo_bootstrap_dag(); assert!( diff --git a/src/v3/std/t_ci_workflow_as_data_demo.dag b/src/v3/std/t_ci_workflow_as_data_demo.dag index 0067e371437..46b53dc6877 100644 --- a/src/v3/std/t_ci_workflow_as_data_demo.dag +++ b/src/v3/std/t_ci_workflow_as_data_demo.dag @@ -49,7 +49,7 @@ data modeled_gunbc_ci_workflow: Workflow = Workflow { name: none, id: none, uses: checkout_action, - with: { fetch_depth: "1" }, + with: Some { value: { fetch_depth: "1" } }, env: { DEMO_CI: "1" }, if_condition: none, continue_on_error: false, @@ -60,7 +60,7 @@ data modeled_gunbc_ci_workflow: Workflow = Workflow { name: none, id: none, uses: setup_rust_action, - with: { rust_version: "stable" }, + with: Some { value: { rust_version: "stable" } }, env: { DEMO_CI: "1" }, if_condition: none, continue_on_error: false, diff --git a/tools/gen_gunbc_ci_workflow_dag/Cargo.toml b/tools/gen_gunbc_ci_workflow_dag/Cargo.toml new file mode 100644 index 00000000000..6b028484c23 --- /dev/null +++ b/tools/gen_gunbc_ci_workflow_dag/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "gen_gunbc_ci_workflow_dag" +version.workspace = true +edition.workspace = true +license.workspace = true + +[lib] +path = "src/lib.rs" + +[[bin]] +name = "gen_gunbc_ci_workflow_dag" +path = "src/main.rs" + +[dependencies] +serde_yaml = { workspace = true } diff --git a/tools/gen_gunbc_ci_workflow_dag/src/lib.rs b/tools/gen_gunbc_ci_workflow_dag/src/lib.rs new file mode 100644 index 00000000000..a3c179f7eac --- /dev/null +++ b/tools/gen_gunbc_ci_workflow_dag/src/lib.rs @@ -0,0 +1,535 @@ +//! Library surface for [`gen_gunbc_ci_workflow_dag`](crate) — shared by the CLI binary and +//! `v3-compiler` integration tests (byte-identical drift gate vs `dsl/gunbc/ci_github_actions_workflow.dag`). + +use serde_yaml::Value; + +/// Fail closed on unknown YAML mapping keys so Actions facts cannot silently drop +/// (P2 facts-flow-forward / P3). +fn reject_unknown_keys( + m: &serde_yaml::Mapping, + allowed: &[&str], + ctx: &str, +) -> Result<(), Box> { + for (k, _) in m { + let key = k + .as_str() + .ok_or_else(|| format!("{ctx}: mapping keys must be YAML strings"))?; + if !allowed.contains(&key) { + return Err(format!( + "{ctx}: unsupported YAML key `{key}` (generator is fail-closed; extend gen_gunbc_ci_workflow_dag if this field should project into the carrier)" + ) + .into()); + } + } + Ok(()) +} + +/// Full `.dag` module text (including header comments). `source_path_in_header` is echoed in the +/// `@generated` line and must match the committed path when checking drift (for example +/// `.github/workflows/ci.yml`). +pub fn emit_ci_github_actions_workflow_module( + source_path_in_header: &str, + raw_yaml: &str, +) -> Result> { + let v: Value = serde_yaml::from_str(raw_yaml)?; + let body = emit_workflow(&v)?; + let mut out = String::new(); + out.push_str(&format!( + "// @generated by tools/gen_gunbc_ci_workflow_dag — source: {source_path_in_header}\n" + )); + out.push_str( + "// Regenerate: CTRL_BUILD_WRAP_CARGO=0 cargo run -q -p gen_gunbc_ci_workflow_dag -- .github/workflows/ci.yml > dsl/gunbc/ci_github_actions_workflow.dag\n", + ); + out.push('\n'); + out.push_str("module gunbc.ci.github_actions_workflow\n"); + out.push('\n'); + out.push_str("import extdeps.github.actions {\n"); + out.push_str(" Workflow, Job, Step, RunStep, UsesStep, ActionRef,\n"); + out.push_str(" WorkflowTrigger, Push, PullRequest,\n"); + out.push_str(" PullRequestActivity, Opened, Synchronize, Reopened, ReadyForReview, Closed,\n"); + out.push_str(" WorkflowPermissions, PermRead, PermWrite, PermNone,\n"); + out.push_str(" ConcurrencySpec, ConcurrencyMappingQueueNotMax,\n"); + out.push_str(" CancelInProgressSpec, CancelInProgressBool,\n"); + out.push_str(" HostedRunner, SelfHosted, RunsOnExpression,\n"); + out.push_str(" RunnerLabel, UbuntuLatest,\n"); + out.push_str(" ShellType, Bash\n"); + out.push_str("}\n"); + out.push('\n'); + out.push_str(&format!( + "data gunbc_ci_github_actions_workflow: Workflow = {body}\n" + )); + Ok(out) +} + +fn emit_workflow(v: &Value) -> Result> { + let m = v.as_mapping().ok_or("workflow root must be mapping")?; + reject_unknown_keys( + m, + &["name", "on", "jobs", "env", "permissions", "concurrency"], + "workflow root", + )?; + let name = str_field(m, "name")?; + let on = emit_triggers(m.get("on").ok_or("missing on:")?)?; + let concurrency = emit_concurrency(m.get("concurrency"))?; + let jobs = emit_jobs(m.get("jobs").ok_or("missing jobs:")?)?; + let env = emit_env_map(m.get("env"))?; + let permissions = emit_permissions(m.get("permissions"))?; + Ok(format!( + "{{\n name: {},\n on: {},\n concurrency: {},\n jobs: {},\n env: {},\n permissions: {}\n}}", + dag_string(&name), + on, + concurrency, + jobs, + env, + permissions + )) +} + +fn str_field(m: &serde_yaml::Mapping, k: &str) -> Result> { + m.get(Value::String(k.to_string())) + .and_then(|v| v.as_str()) + .map(|s| s.to_string()) + .ok_or_else(|| format!("missing string field {k}").into()) +} + +/// Escape `s` as a v3 `.dag` string literal token. +/// +/// Today this uses Rust `Debug` quoting (`{:?}`), which matches the repo's +/// `.github/workflows/ci.yml` inputs in practice but is **not** formally the DSL lexer +/// string grammar (e.g. Unicode escapes could diverge). If this generator is reused for +/// broader YAML, replace with a lexer-aligned escaper shared with the compiler. +fn dag_string(s: &str) -> String { + format!("{:?}", s) +} + +fn emit_triggers(on: &Value) -> Result> { + let m = on.as_mapping().ok_or("on: must be mapping")?; + reject_unknown_keys(m, &["push", "pull_request"], "workflow.on")?; + let mut parts: Vec = Vec::new(); + for (k, v) in m { + let key = k.as_str().ok_or("on: key must be string")?; + match key { + "push" => parts.push(emit_push(v)?), + "pull_request" => parts.push(emit_pull_request(v)?), + other => return Err(format!("unsupported on.{other}").into()), + } + } + if parts.is_empty() { + return Err("on: must contain at least one trigger".into()); + } + Ok(emit_list_literal(&parts)) +} + +fn emit_push(v: &Value) -> Result> { + let m = v.as_mapping().ok_or("push: mapping")?; + reject_unknown_keys(m, &["branches", "paths"], "on.push")?; + let branches = string_list_opt(m.get("branches"))?; + let paths = string_list_opt(m.get("paths"))?; + Ok(format!( + "Push {{ branches: {}, paths: {} }}", + branches, paths + )) +} + +fn emit_pull_request(v: &Value) -> Result> { + let m = v.as_mapping().ok_or("pull_request: mapping")?; + reject_unknown_keys(m, &["branches", "types"], "on.pull_request")?; + let branches = string_list_opt(m.get("branches"))?; + let types = pr_types_list(m.get("types"))?; + Ok(format!( + "PullRequest {{ branches: {}, types: {} }}", + branches, types + )) +} + +fn string_list_opt(v: Option<&Value>) -> Result> { + let Some(v) = v else { + return Ok("[]".to_string()); + }; + let seq = v.as_sequence().ok_or("expected sequence")?; + let mut xs: Vec = Vec::new(); + for it in seq { + let s = it.as_str().ok_or("sequence of strings")?; + xs.push(dag_string(s)); + } + Ok(emit_list_literal(&xs)) +} + +fn pr_types_list(v: Option<&Value>) -> Result> { + let Some(v) = v else { + return Ok("[]".to_string()); + }; + let seq = v.as_sequence().ok_or("types must be sequence")?; + let mut arms: Vec = Vec::new(); + for it in seq { + let s = it.as_str().ok_or("pr type string")?; + let arm = match s { + "opened" => "Opened", + "synchronize" => "Synchronize", + "reopened" => "Reopened", + "ready_for_review" => "ReadyForReview", + "closed" => "Closed", + _ => return Err(format!("unknown pull_request type {s}").into()), + }; + arms.push(arm.to_string()); + } + Ok(emit_list_literal(&arms)) +} + +fn emit_list_literal(items: &[String]) -> String { + if items.is_empty() { + "[]".to_string() + } else { + format!("[{}]", items.join(", ")) + } +} + +fn emit_concurrency(v: Option<&Value>) -> Result> { + let Some(v) = v else { + return Ok("none".to_string()); + }; + let m = v.as_mapping().ok_or("concurrency mapping")?; + reject_unknown_keys(m, &["group", "cancel-in-progress"], "workflow.concurrency")?; + let group = str_field(m, "group")?; + let cip = m.get(Value::String("cancel-in-progress".to_string())); + let cancel = match cip { + None => "none".to_string(), + Some(Value::Bool(true)) => { + "Some { value: CancelInProgressBool { value: true } }".to_string() + } + Some(Value::Bool(false)) => { + "Some { value: CancelInProgressBool { value: false } }".to_string() + } + Some(other) => return Err(format!("unsupported cancel-in-progress: {other:?}").into()), + }; + Ok(format!( + "Some {{\n value: ConcurrencyMappingQueueNotMax {{\n group: {},\n cancel_in_progress: {},\n explicit_single: none\n }}\n }}", + dag_string(&group), + cancel + )) +} + +fn emit_env_map(v: Option<&Value>) -> Result> { + emit_optional_string_map(v) +} + +fn emit_optional_string_map(v: Option<&Value>) -> Result> { + let Some(v) = v else { + return Ok("none".to_string()); + }; + let m = v + .as_mapping() + .ok_or("optional string map must be a YAML mapping")?; + if m.is_empty() { + return Ok("none".to_string()); + } + Ok(format!("Some {{ value: {} }}", string_map_literal_body(v)?)) +} + +fn string_map_literal_body(v: &Value) -> Result> { + let m = v.as_mapping().ok_or("map")?; + if m.is_empty() { + return Err("internal: string_map_literal_body on empty map".into()); + } + let mut inner = String::new(); + for (k, val) in m { + let k = k.as_str().ok_or("map key must be string")?; + let vs = yaml_scalar_to_dag_string(val)?; + let key_expr = dag_string(k); + if !inner.is_empty() { + inner.push_str(", "); + } + inner.push_str(&format!("{key_expr}: {vs}")); + } + Ok(format!("{{ {inner} }}")) +} + +fn yaml_scalar_to_dag_string(v: &Value) -> Result> { + Ok(match v { + Value::String(s) => dag_string(s), + Value::Bool(b) => dag_string(&b.to_string()), + Value::Number(n) => dag_string(&n.to_string()), + // Fail closed: `null` in a string-valued Actions slot is not a faithful scalar — do not + // fabricate `""` (INVARIANTS P3/M5). Omit the key in YAML or emit an explicit string. + Value::Null => { + return Err("YAML null is not a representable GitHub Actions string scalar".into()); + } + _ => return Err(format!("unsupported scalar {v:?}").into()), + }) +} + +fn emit_permissions(v: Option<&Value>) -> Result> { + let Some(v) = v else { + return Ok("none".to_string()); + }; + let m = v.as_mapping().ok_or("permissions mapping")?; + reject_unknown_keys( + m, + &["contents", "pull-requests", "issues", "actions"], + "workflow.permissions", + )?; + let contents = perm_level(m.get("contents"))?; + let pull_requests = perm_level(m.get("pull-requests"))?; + let issues = perm_level(m.get("issues"))?; + let actions = perm_level(m.get("actions"))?; + Ok(format!( + "Some {{\n value: {{\n contents: {},\n pull_requests: {},\n issues: {},\n actions: {}\n }}\n }}", + contents, pull_requests, issues, actions + )) +} + +fn perm_level(v: Option<&Value>) -> Result<&'static str, Box> { + let Some(v) = v else { + return Ok("PermNone"); + }; + let s = v.as_str().ok_or("permission level string")?; + match s { + "read" => Ok("PermRead"), + "write" => Ok("PermWrite"), + "none" => Ok("PermNone"), + _ => Err(format!("unknown permission {s}").into()), + } +} + +fn emit_jobs(v: &Value) -> Result> { + let m = v.as_mapping().ok_or("jobs mapping")?; + let mut job_exprs: Vec = Vec::new(); + for (k, job) in m { + let id = k.as_str().ok_or("job id key must be string")?; + job_exprs.push(emit_job(id, job)?); + } + Ok(emit_list_literal(&job_exprs)) +} + +fn emit_job(id: &str, v: &Value) -> Result> { + let m = v.as_mapping().ok_or("job mapping")?; + reject_unknown_keys( + m, + &[ + "name", + "if", + "runs-on", + "timeout-minutes", + "steps", + "needs", + "env", + "outputs", + "strategy", + "continue-on-error", + "concurrency", + ], + &format!("job[{id}]"), + )?; + let name = match m.get(Value::String("name".to_string())) { + None => "none".to_string(), + Some(Value::String(s)) => format!("Some {{ value: {} }}", dag_string(s)), + Some(_) => return Err("job name must be string".into()), + }; + let runner = emit_runs_on(m.get("runs-on").ok_or("runs-on")?)?; + let steps = emit_steps(m.get("steps").ok_or("steps")?)?; + let needs = emit_needs_list(m.get("needs"))?; + let env = emit_optional_string_map(m.get(Value::String("env".to_string())))?; + let outputs = emit_optional_string_map(m.get(Value::String("outputs".to_string())))?; + let if_condition = match m.get(Value::String("if".to_string())) { + None => "none".to_string(), + Some(i) => format!("Some {{ value: {} }}", yaml_scalar_to_dag_string(i)?), + }; + let strategy = match m.get(Value::String("strategy".to_string())) { + None => "none".to_string(), + Some(_) => return Err("matrix strategy not supported by generator yet".into()), + }; + let timeout_minutes = match m.get(Value::String("timeout-minutes".to_string())) { + None => "none".to_string(), + Some(Value::Number(n)) => { + let v = if let Some(u) = n.as_u64() { + u.to_string() + } else if let Some(i) = n.as_i64() { + i.to_string() + } else { + return Err("timeout-minutes number".into()); + }; + format!("Some {{ value: {v} }}") + } + Some(_) => return Err("timeout-minutes must be number".into()), + }; + let continue_on_error = match m.get(Value::String("continue-on-error".to_string())) { + None => "false".to_string(), + Some(Value::Bool(b)) => b.to_string(), + Some(_) => return Err("continue-on-error must be bool".into()), + }; + let job_concurrency = match m.get(Value::String("concurrency".to_string())) { + None => "none".to_string(), + Some(_) => return Err("job-level concurrency not supported".into()), + }; + Ok(format!( + "{{\n id: {},\n name: {},\n runner: {},\n steps: {},\n needs: {},\n env: {},\n outputs: {},\n if_condition: {},\n strategy: {},\n timeout_minutes: {},\n continue_on_error: {},\n concurrency: {}\n }}", + dag_string(id), + name, + runner, + steps, + needs, + env, + outputs, + if_condition, + strategy, + timeout_minutes, + continue_on_error, + job_concurrency + )) +} + +fn emit_runs_on(v: &Value) -> Result> { + let s = v.as_str().ok_or("runs-on string")?; + if s.starts_with("${{") { + return Ok(format!( + "RunsOnExpression {{ expression: {} }}", + dag_string(s) + )); + } + match s { + "ubuntu-latest" => Ok("HostedRunner { label: UbuntuLatest }".to_string()), + _ => Ok(format!("SelfHosted {{ labels: [{}] }}", dag_string(s))), + } +} + +fn emit_needs_list(v: Option<&Value>) -> Result> { + let Some(v) = v else { + return Ok("[]".to_string()); + }; + let seq = v.as_sequence().ok_or("needs sequence")?; + let mut xs: Vec = Vec::new(); + for it in seq { + let s = it.as_str().ok_or("needs string")?; + xs.push(dag_string(s)); + } + Ok(emit_list_literal(&xs)) +} + +fn emit_steps(v: &Value) -> Result> { + let seq = v.as_sequence().ok_or("steps sequence")?; + let mut steps: Vec = Vec::new(); + for st in seq { + steps.push(emit_step(st)?); + } + Ok(emit_list_literal(&steps)) +} + +fn emit_step(v: &Value) -> Result> { + let m = v.as_mapping().ok_or("step mapping")?; + let has_uses = m.get(Value::String("uses".to_string())).is_some(); + let has_run = m.get(Value::String("run".to_string())).is_some(); + if has_uses { + reject_unknown_keys( + m, + &[ + "name", + "id", + "uses", + "with", + "env", + "if", + "continue-on-error", + "timeout-minutes", + ], + "uses step", + )?; + } else if has_run { + reject_unknown_keys( + m, + &[ + "name", + "id", + "run", + "env", + "working-directory", + "if", + "continue-on-error", + "timeout-minutes", + ], + "run step", + )?; + } else { + return Err("step must have uses or run".into()); + } + let name = match m.get(Value::String("name".to_string())) { + None => "none".to_string(), + Some(Value::String(s)) => format!("Some {{ value: {} }}", dag_string(s)), + Some(_) => return Err("step name".into()), + }; + let id = match m.get(Value::String("id".to_string())) { + None => "none".to_string(), + Some(Value::String(s)) => format!("Some {{ value: {} }}", dag_string(s)), + Some(_) => return Err("step id".into()), + }; + let if_condition = match m.get(Value::String("if".to_string())) { + None => "none".to_string(), + Some(i) => format!("Some {{ value: {} }}", yaml_scalar_to_dag_string(i)?), + }; + let continue_on_error = match m.get(Value::String("continue-on-error".to_string())) { + None => "false".to_string(), + Some(Value::Bool(b)) => b.to_string(), + Some(_) => return Err("continue-on-error bool".into()), + }; + let timeout_minutes = match m.get(Value::String("timeout-minutes".to_string())) { + None => "none".to_string(), + Some(Value::Number(n)) => { + let v = if let Some(u) = n.as_u64() { + u.to_string() + } else if let Some(i) = n.as_i64() { + i.to_string() + } else { + return Err("timeout".into()); + }; + format!("Some {{ value: {v} }}") + } + Some(_) => return Err("timeout-minutes".into()), + }; + if let Some(uses) = m.get(Value::String("uses".to_string())) { + let uses_s = uses.as_str().ok_or("uses string")?; + let ar = emit_action_ref(uses_s)?; + let with = emit_optional_string_map(m.get(Value::String("with".to_string())))?; + let env = emit_optional_string_map(m.get(Value::String("env".to_string())))?; + Ok(format!( + "UsesStep {{\n name: {},\n id: {},\n uses: {},\n with: {},\n env: {},\n if_condition: {},\n continue_on_error: {},\n timeout_minutes: {}\n }}", + name, + id, + ar, + with, + env, + if_condition, + continue_on_error, + timeout_minutes + )) + } else if let Some(run) = m.get(Value::String("run".to_string())) { + let run_s = run.as_str().ok_or("run string")?; + let env = emit_optional_string_map(m.get(Value::String("env".to_string())))?; + let wd = match m.get(Value::String("working-directory".to_string())) { + None => "none".to_string(), + Some(w) => format!("Some {{ value: {} }}", yaml_scalar_to_dag_string(w)?), + }; + Ok(format!( + "RunStep {{\n name: {},\n id: {},\n run: {},\n shell: Bash,\n env: {},\n working_directory: {},\n if_condition: {},\n continue_on_error: {},\n timeout_minutes: {}\n }}", + name, + id, + dag_string(run_s), + env, + wd, + if_condition, + continue_on_error, + timeout_minutes + )) + } else { + unreachable!("emit_step: uses vs run validated at start") + } +} + +fn emit_action_ref(uses: &str) -> Result> { + let (owner_repo, ref_part) = uses.rsplit_once('@').ok_or("uses must contain @")?; + let (owner, repo) = owner_repo.split_once('/').ok_or("uses owner/repo")?; + Ok(format!( + "{{ owner: {}, repo: {}, ref: {} }}", + dag_string(owner), + dag_string(repo), + dag_string(ref_part) + )) +} diff --git a/tools/gen_gunbc_ci_workflow_dag/src/main.rs b/tools/gen_gunbc_ci_workflow_dag/src/main.rs new file mode 100644 index 00000000000..c05f60e654e --- /dev/null +++ b/tools/gen_gunbc_ci_workflow_dag/src/main.rs @@ -0,0 +1,19 @@ +//! Regenerate `dsl/gunbc/ci_github_actions_workflow.dag` from `.github/workflows/ci.yml`. +//! +//! Run from repo root (local cargo, bypass ctrl-build shims): +//! CTRL_BUILD_WRAP_CARGO=0 cargo run -q -p gen_gunbc_ci_workflow_dag -- .github/workflows/ci.yml \\ +//! > dsl/gunbc/ci_github_actions_workflow.dag + +use std::env; +use std::fs; +use std::io::{self, Write}; + +fn main() -> Result<(), Box> { + let path = env::args() + .nth(1) + .ok_or("usage: gen_gunbc_ci_workflow_dag ")?; + let raw = fs::read_to_string(&path)?; + let out = gen_gunbc_ci_workflow_dag::emit_ci_github_actions_workflow_module(&path, &raw)?; + io::stdout().write_all(out.as_bytes())?; + Ok(()) +}