diff --git a/dsl/extdeps/languages/rust/primitives.dag b/dsl/extdeps/languages/rust/primitives.dag index f989b629a97..e2fd1557836 100644 --- a/dsl/extdeps/languages/rust/primitives.dag +++ b/dsl/extdeps/languages/rust/primitives.dag @@ -2,7 +2,7 @@ // declarations for the Rust target. // // PILOT SCOPE (T-Ground-Pilot): {i8, i16, i32, i64, i128, u8, u16, u32, u64, -// u128, bool, ()} only. No containers, no floats, no coercion paths. +// u128, f32, f64, bool, ()} only. No containers, no coercion paths. // // T-Int128 SLICE B1 / B2 (RESOLVED 2026-05-06): both signed `i128` and // unsigned `u128` rows are present. The prior B2 deferral of `u128` @@ -106,8 +106,9 @@ import std.bit { Bit, Byte, Word16, Word32, Word64, Word128 } // SemiringAlgebra <-> std.algebra.Semiring (unsigned integers) // // NonIntegerAlgebra -// BooleanAlgebraAlgebra<-> std.algebra.BooleanAlgebra (Bool) -// TerminalAlgebra <-> single-inhabitant terminal (Unit; DB-11) +// ApproximateFieldAlgebra<-> v3.std.approximate_field.ApproximateField (Float) +// BooleanAlgebraAlgebra <-> std.algebra.BooleanAlgebra (Bool) +// TerminalAlgebra <-> single-inhabitant terminal (Unit; DB-11) // // Substrate-gap flag #2: these tags are bridges to algebra references. // ========================================================================= @@ -117,7 +118,8 @@ type IntegerAlgebra | SemiringAlgebra type NonIntegerAlgebra - = BooleanAlgebraAlgebra + = ApproximateFieldAlgebra + | BooleanAlgebraAlgebra | TerminalAlgebra @@ -131,8 +133,8 @@ type NonIntegerAlgebra // BitCarrier <-> std.bit.Bit (BooleanAlgebra value-domain: 2-element set) // ByteCarrier <-> std.bit.Byte (Ring/Semiring value-domain over 2^8) // Word16Carrier <-> std.bit.Word16 (Ring/Semiring value-domain over 2^16) -// Word32Carrier <-> std.bit.Word32 (Ring/Semiring value-domain over 2^32) -// Word64Carrier <-> std.bit.Word64 (Ring/Semiring value-domain over 2^64) +// Word32Carrier <-> std.bit.Word32 (Ring/Semiring or ApproximateField width axis) +// Word64Carrier <-> std.bit.Word64 (Ring/Semiring or ApproximateField width axis) // Word128Carrier <-> std.bit.Word128 (Ring/Semiring value-domain over 2^128) // TerminalCarrier<-> single inhabitant (Unit; DB-11 -> Cardinality 1) // @@ -214,8 +216,8 @@ type RustPrimitive // ========================================================================= // Pilot-set declarations. // -// Ordering: signed machine integers (i8..i64, i128), unsigned machine integers -// (u8..u64, u128), bool, (). No other types in pilot scope. +// Ordering: signed integers (i8..i128), unsigned integers (u8..u128), floats +// (f32, f64), bool, (). No other types in pilot scope. // ========================================================================= data rust_pilot_primitives: List = [ @@ -279,6 +281,20 @@ data rust_pilot_primitives: List = [ is_copy: true, overflow: TwoComplementWrap }, + // -- Floats : ApproximateField over machine-width refinements ---------- + // Rust Reference §3.4. Floating-point types are IEEE 754 binary32/binary64. + // Substrate authority: `dsl/std/float.dag` declares Float32/Float64 as + // `Compose>`; `Real` is + // `ApproximateField>`, keeping exact-rational carrier + // and approximate witness layers distinct. + + NonIntegerPrimitive { target_name: "f32", algebra: ApproximateFieldAlgebra, carrier: Word32Carrier, + is_copy: true }, + + NonIntegerPrimitive { target_name: "f64", algebra: ApproximateFieldAlgebra, carrier: Word64Carrier, + is_copy: true }, + + // -- Bool : BooleanAlgebra over Bit ----------------------------------- // Rust Reference §3.5. The canonical two-element Boolean algebra; carrier // is a single Bit. diff --git a/src/v3/compiler/src/bootstrap_generated.rs b/src/v3/compiler/src/bootstrap_generated.rs index f824666ecdf..b9747a78139 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: 844, - next_declaration_id: 3204, + next_declaration_id: 3205, next_port_id: 1009, 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: 3204, + declaration_append_begin_after_bootstrap: 3205, } } @@ -9734,7 +9734,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(3204); + let mut declarations = Vec::with_capacity(3205); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -63021,7 +63021,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6314, 6376), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6404, 6466), }); declarations.push(Declaration { id: DeclarationId(1685), @@ -63029,13 +63029,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { connective: TypeConnective::Disj { variants: vec![ Field { - label: "BooleanAlgebraAlgebra".to_string(), + label: "ApproximateFieldAlgebra".to_string(), ty: DeclarationId(2695), }, Field { - label: "TerminalAlgebra".to_string(), + label: "BooleanAlgebraAlgebra".to_string(), ty: DeclarationId(2696), }, + Field { + label: "TerminalAlgebra".to_string(), + ty: DeclarationId(2697), + }, ], }, type_params: vec![], @@ -63046,7 +63050,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6378, 6446), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6468, 6564), }); declarations.push(Declaration { id: DeclarationId(1686), @@ -63055,31 +63059,31 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "BitCarrier".to_string(), - ty: DeclarationId(2697), + ty: DeclarationId(2698), }, Field { label: "ByteCarrier".to_string(), - ty: DeclarationId(2698), + ty: DeclarationId(2699), }, Field { label: "Word16Carrier".to_string(), - ty: DeclarationId(2699), + ty: DeclarationId(2700), }, Field { label: "Word32Carrier".to_string(), - ty: DeclarationId(2700), + ty: DeclarationId(2701), }, Field { label: "Word64Carrier".to_string(), - ty: DeclarationId(2701), + ty: DeclarationId(2702), }, Field { label: "Word128Carrier".to_string(), - ty: DeclarationId(2702), + ty: DeclarationId(2703), }, Field { label: "TerminalCarrier".to_string(), - ty: DeclarationId(2703), + ty: DeclarationId(2704), }, ], }, @@ -63091,7 +63095,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8020, 8162), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8154, 8296), }); declarations.push(Declaration { id: DeclarationId(1687), @@ -63100,15 +63104,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "TwoComplementWrap".to_string(), - ty: DeclarationId(2704), + ty: DeclarationId(2705), }, Field { label: "Saturating".to_string(), - ty: DeclarationId(2705), + ty: DeclarationId(2706), }, Field { label: "Trap".to_string(), - ty: DeclarationId(2706), + ty: DeclarationId(2707), }, ], }, @@ -63120,7 +63124,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8879, 8945), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9013, 9079), }); declarations.push(Declaration { id: DeclarationId(1688), @@ -63129,11 +63133,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "IntegerPrimitive".to_string(), - ty: DeclarationId(2707), + ty: DeclarationId(2708), }, Field { label: "NonIntegerPrimitive".to_string(), - ty: DeclarationId(2708), + ty: DeclarationId(2709), }, ], }, @@ -63145,7 +63149,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9700, 10482), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9834, 10616), }); declarations.push(Declaration { id: DeclarationId(1689), @@ -63159,12 +63163,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, type_params: vec![], phantom_params: Vec::new(), - meta_tag: Some(DeclarationId(2709)), + meta_tag: Some(DeclarationId(2710)), specialization_parent: None, inhabits: None, value_body: Some(ValueBody::List(vec![ FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("i8".to_string())), FieldValue::Variant { @@ -63172,20 +63176,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2698), + constructor: DeclarationId(2699), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-128".to_string())), FieldValue::Literal(LiteralBits::String("127".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("i16".to_string())), FieldValue::Variant { @@ -63193,20 +63197,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2699), + constructor: DeclarationId(2700), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-32768".to_string())), FieldValue::Literal(LiteralBits::String("32767".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("i32".to_string())), FieldValue::Variant { @@ -63214,20 +63218,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2700), + constructor: DeclarationId(2701), payload: vec![], }, FieldValue::Literal(LiteralBits::String("-2147483648".to_string())), FieldValue::Literal(LiteralBits::String("2147483647".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("i64".to_string())), FieldValue::Variant { @@ -63235,7 +63239,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2701), + constructor: DeclarationId(2702), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -63244,13 +63248,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { FieldValue::Literal(LiteralBits::String("9223372036854775807".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("i128".to_string())), FieldValue::Variant { @@ -63258,7 +63262,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2702), + constructor: DeclarationId(2703), payload: vec![], }, FieldValue::Literal(LiteralBits::String( @@ -63269,13 +63273,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("u8".to_string())), FieldValue::Variant { @@ -63283,20 +63287,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2698), + constructor: DeclarationId(2699), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("255".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("u16".to_string())), FieldValue::Variant { @@ -63304,20 +63308,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2699), + constructor: DeclarationId(2700), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("65535".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("u32".to_string())), FieldValue::Variant { @@ -63325,20 +63329,20 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2700), + constructor: DeclarationId(2701), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), FieldValue::Literal(LiteralBits::String("4294967295".to_string())), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("u64".to_string())), FieldValue::Variant { @@ -63346,7 +63350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2701), + constructor: DeclarationId(2702), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -63355,13 +63359,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2707), + constructor: DeclarationId(2708), payload: vec![ FieldValue::Literal(LiteralBits::String("u128".to_string())), FieldValue::Variant { @@ -63369,7 +63373,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2702), + constructor: DeclarationId(2703), payload: vec![], }, FieldValue::Literal(LiteralBits::String("0".to_string())), @@ -63378,36 +63382,66 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { )), FieldValue::Literal(LiteralBits::Bool(true)), FieldValue::Variant { - constructor: DeclarationId(2704), + constructor: DeclarationId(2705), payload: vec![], }, ], }, FieldValue::Variant { - constructor: DeclarationId(2708), + constructor: DeclarationId(2709), payload: vec![ - FieldValue::Literal(LiteralBits::String("bool".to_string())), + FieldValue::Literal(LiteralBits::String("f32".to_string())), FieldValue::Variant { constructor: DeclarationId(2695), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2697), + constructor: DeclarationId(2701), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), ], }, FieldValue::Variant { - constructor: DeclarationId(2708), + constructor: DeclarationId(2709), payload: vec![ - FieldValue::Literal(LiteralBits::String("()".to_string())), + FieldValue::Literal(LiteralBits::String("f64".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2695), + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2702), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::Bool(true)), + ], + }, + FieldValue::Variant { + constructor: DeclarationId(2709), + payload: vec![ + FieldValue::Literal(LiteralBits::String("bool".to_string())), FieldValue::Variant { constructor: DeclarationId(2696), payload: vec![], }, FieldValue::Variant { - constructor: DeclarationId(2703), + constructor: DeclarationId(2698), + payload: vec![], + }, + FieldValue::Literal(LiteralBits::Bool(true)), + ], + }, + FieldValue::Variant { + constructor: DeclarationId(2709), + payload: vec![ + FieldValue::Literal(LiteralBits::String("()".to_string())), + FieldValue::Variant { + constructor: DeclarationId(2697), + payload: vec![], + }, + FieldValue::Variant { + constructor: DeclarationId(2704), payload: vec![], }, FieldValue::Literal(LiteralBits::Bool(true)), @@ -63416,7 +63450,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { ])), refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10810, 14801), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10937, 15602), }); declarations.push(Declaration { id: DeclarationId(1690), @@ -63425,23 +63459,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Wildcard".to_string(), - ty: DeclarationId(2710), + ty: DeclarationId(2711), }, Field { label: "Exact".to_string(), - ty: DeclarationId(2711), + ty: DeclarationId(2712), }, Field { label: "Listed".to_string(), - ty: DeclarationId(2713), + ty: DeclarationId(2714), }, Field { label: "Ranged".to_string(), - ty: DeclarationId(2714), + ty: DeclarationId(2715), }, Field { label: "Step".to_string(), - ty: DeclarationId(2715), + ty: DeclarationId(2716), }, ], }, @@ -63593,15 +63627,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "User".to_string(), - ty: DeclarationId(2716), + ty: DeclarationId(2717), }, Field { label: "Bot".to_string(), - ty: DeclarationId(2717), + ty: DeclarationId(2718), }, Field { label: "Organization".to_string(), - ty: DeclarationId(2718), + ty: DeclarationId(2719), }, ], }, @@ -63692,11 +63726,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "scopes".to_string(), - ty: DeclarationId(2719), + ty: DeclarationId(2720), }, Field { label: "expires_at".to_string(), - ty: DeclarationId(2720), + ty: DeclarationId(2721), }, ], }, @@ -63717,23 +63751,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "ScopeRepo".to_string(), - ty: DeclarationId(2721), + ty: DeclarationId(2722), }, Field { label: "ScopeGist".to_string(), - ty: DeclarationId(2722), + ty: DeclarationId(2723), }, Field { label: "ScopeWorkflow".to_string(), - ty: DeclarationId(2723), + ty: DeclarationId(2724), }, Field { label: "ScopeReadOrg".to_string(), - ty: DeclarationId(2724), + ty: DeclarationId(2725), }, Field { label: "ScopeReadUser".to_string(), - ty: DeclarationId(2725), + ty: DeclarationId(2726), }, ], }, @@ -63758,7 +63792,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "cursor".to_string(), - ty: DeclarationId(2726), + ty: DeclarationId(2727), }, Field { label: "has_next".to_string(), @@ -63783,15 +63817,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PermRead".to_string(), - ty: DeclarationId(2727), + ty: DeclarationId(2728), }, Field { label: "PermWrite".to_string(), - ty: DeclarationId(2728), + ty: DeclarationId(2729), }, Field { label: "PermAdmin".to_string(), - ty: DeclarationId(2729), + ty: DeclarationId(2730), }, ], }, @@ -63869,19 +63903,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "on".to_string(), - ty: DeclarationId(2730), + ty: DeclarationId(2731), }, Field { label: "jobs".to_string(), - ty: DeclarationId(2731), + ty: DeclarationId(2732), }, Field { label: "env".to_string(), - ty: DeclarationId(2732), + ty: DeclarationId(2733), }, Field { label: "permissions".to_string(), - ty: DeclarationId(2733), + ty: DeclarationId(2734), }, ], }, @@ -63935,15 +63969,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "PermRead".to_string(), - ty: DeclarationId(2734), + ty: DeclarationId(2735), }, Field { label: "PermWrite".to_string(), - ty: DeclarationId(2735), + ty: DeclarationId(2736), }, Field { label: "PermNone".to_string(), - ty: DeclarationId(2736), + ty: DeclarationId(2737), }, ], }, @@ -63964,23 +63998,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Push".to_string(), - ty: DeclarationId(2739), + ty: DeclarationId(2740), }, Field { label: "PullRequest".to_string(), - ty: DeclarationId(2742), + ty: DeclarationId(2743), }, Field { label: "Schedule".to_string(), - ty: DeclarationId(2743), + ty: DeclarationId(2744), }, Field { label: "WorkflowDispatch".to_string(), - ty: DeclarationId(2745), + ty: DeclarationId(2746), }, Field { label: "WorkflowCall".to_string(), - ty: DeclarationId(2747), + ty: DeclarationId(2748), }, ], }, @@ -64001,19 +64035,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Opened".to_string(), - ty: DeclarationId(2748), + ty: DeclarationId(2749), }, Field { label: "Synchronize".to_string(), - ty: DeclarationId(2749), + ty: DeclarationId(2750), }, Field { label: "Reopened".to_string(), - ty: DeclarationId(2750), + ty: DeclarationId(2751), }, Field { label: "Closed".to_string(), - ty: DeclarationId(2751), + ty: DeclarationId(2752), }, ], }, @@ -64038,7 +64072,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "description".to_string(), - ty: DeclarationId(2752), + ty: DeclarationId(2753), }, Field { label: "required".to_string(), @@ -64046,7 +64080,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "default".to_string(), - ty: DeclarationId(2753), + ty: DeclarationId(2754), }, Field { label: "type".to_string(), @@ -64071,19 +64105,19 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "InputString".to_string(), - ty: DeclarationId(2754), + ty: DeclarationId(2755), }, Field { label: "InputBoolean".to_string(), - ty: DeclarationId(2755), + ty: DeclarationId(2756), }, Field { label: "InputChoice".to_string(), - ty: DeclarationId(2756), + ty: DeclarationId(2757), }, Field { label: "InputEnvironment".to_string(), - ty: DeclarationId(2757), + ty: DeclarationId(2758), }, ], }, @@ -64104,15 +64138,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "StepScope".to_string(), - ty: DeclarationId(2758), + ty: DeclarationId(2759), }, Field { label: "JobScope".to_string(), - ty: DeclarationId(2759), + ty: DeclarationId(2760), }, Field { label: "WorkflowScope".to_string(), - ty: DeclarationId(2760), + ty: DeclarationId(2761), }, ], }, @@ -64162,7 +64196,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "name".to_string(), - ty: DeclarationId(2761), + ty: DeclarationId(2762), }, Field { label: "runner".to_string(), @@ -64170,27 +64204,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "steps".to_string(), - ty: DeclarationId(2762), + ty: DeclarationId(2763), }, Field { label: "needs".to_string(), - ty: DeclarationId(2763), + ty: DeclarationId(2764), }, Field { label: "env".to_string(), - ty: DeclarationId(2764), + ty: DeclarationId(2765), }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2765), + ty: DeclarationId(2766), }, Field { label: "strategy".to_string(), - ty: DeclarationId(2766), + ty: DeclarationId(2767), }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2767), + ty: DeclarationId(2768), }, Field { label: "continue_on_error".to_string(), @@ -64198,7 +64232,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "concurrency".to_string(), - ty: DeclarationId(2768), + ty: DeclarationId(2769), }, ], }, @@ -64244,11 +64278,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "HostedRunner".to_string(), - ty: DeclarationId(2769), + ty: DeclarationId(2770), }, Field { label: "SelfHosted".to_string(), - ty: DeclarationId(2771), + ty: DeclarationId(2772), }, ], }, @@ -64269,27 +64303,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "UbuntuLatest".to_string(), - ty: DeclarationId(2772), + ty: DeclarationId(2773), }, Field { label: "Ubuntu2404".to_string(), - ty: DeclarationId(2773), + ty: DeclarationId(2774), }, Field { label: "Ubuntu2204".to_string(), - ty: DeclarationId(2774), + ty: DeclarationId(2775), }, Field { label: "MacosLatest".to_string(), - ty: DeclarationId(2775), + ty: DeclarationId(2776), }, Field { label: "Macos14".to_string(), - ty: DeclarationId(2776), + ty: DeclarationId(2777), }, Field { label: "WindowsLatest".to_string(), - ty: DeclarationId(2777), + ty: DeclarationId(2778), }, ], }, @@ -64310,11 +64344,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "RunStep".to_string(), - ty: DeclarationId(2783), + ty: DeclarationId(2784), }, Field { label: "UsesStep".to_string(), - ty: DeclarationId(2789), + ty: DeclarationId(2790), }, ], }, @@ -64335,23 +64369,23 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Bash".to_string(), - ty: DeclarationId(2790), + ty: DeclarationId(2791), }, Field { label: "Sh".to_string(), - ty: DeclarationId(2791), + ty: DeclarationId(2792), }, Field { label: "Pwsh".to_string(), - ty: DeclarationId(2792), + ty: DeclarationId(2793), }, Field { label: "Python".to_string(), - ty: DeclarationId(2793), + ty: DeclarationId(2794), }, Field { label: "Cmd".to_string(), - ty: DeclarationId(2794), + ty: DeclarationId(2795), }, ], }, @@ -64401,35 +64435,35 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "AnnotationError".to_string(), - ty: DeclarationId(2798), + ty: DeclarationId(2799), }, Field { label: "AnnotationWarning".to_string(), - ty: DeclarationId(2802), + ty: DeclarationId(2803), }, Field { label: "AnnotationNotice".to_string(), - ty: DeclarationId(2806), + ty: DeclarationId(2807), }, Field { label: "AnnotationGroup".to_string(), - ty: DeclarationId(2807), + ty: DeclarationId(2808), }, Field { label: "AnnotationEndGroup".to_string(), - ty: DeclarationId(2808), + ty: DeclarationId(2809), }, Field { label: "SetOutput".to_string(), - ty: DeclarationId(2809), + ty: DeclarationId(2810), }, Field { label: "AddMask".to_string(), - ty: DeclarationId(2810), + ty: DeclarationId(2811), }, Field { label: "StopCommands".to_string(), - ty: DeclarationId(2811), + ty: DeclarationId(2812), }, ], }, @@ -64602,11 +64636,11 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Upload".to_string(), - ty: DeclarationId(2813), + ty: DeclarationId(2814), }, Field { label: "Download".to_string(), - ty: DeclarationId(2815), + ty: DeclarationId(2816), }, ], }, @@ -64627,15 +64661,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Warn".to_string(), - ty: DeclarationId(2816), + ty: DeclarationId(2817), }, Field { label: "ErrorOut".to_string(), - ty: DeclarationId(2817), + ty: DeclarationId(2818), }, Field { label: "Ignore".to_string(), - ty: DeclarationId(2818), + ty: DeclarationId(2819), }, ], }, @@ -64698,15 +64732,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { children: vec![ Field { label: "dimensions".to_string(), - ty: DeclarationId(2820), + ty: DeclarationId(2821), }, Field { label: "include".to_string(), - ty: DeclarationId(2822), + ty: DeclarationId(2823), }, Field { label: "exclude".to_string(), - ty: DeclarationId(2824), + ty: DeclarationId(2825), }, Field { label: "fail_fast".to_string(), @@ -64714,7 +64748,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "max_parallel".to_string(), - ty: DeclarationId(2825), + ty: DeclarationId(2826), }, ], }, @@ -64735,27 +64769,27 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { variants: vec![ Field { label: "Success".to_string(), - ty: DeclarationId(2826), + ty: DeclarationId(2827), }, Field { label: "Failure".to_string(), - ty: DeclarationId(2827), + ty: DeclarationId(2828), }, Field { label: "Cancelled".to_string(), - ty: DeclarationId(2828), + ty: DeclarationId(2829), }, Field { label: "Skipped".to_string(), - ty: DeclarationId(2829), + ty: DeclarationId(2830), }, Field { label: "TimedOut".to_string(), - ty: DeclarationId(2830), + ty: DeclarationId(2831), }, Field { label: "ActionRequired".to_string(), - ty: DeclarationId(2831), + ty: DeclarationId(2832), }, ], }, @@ -82653,7 +82687,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6338, 6356), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6428, 6446), }); declarations.push(Declaration { id: DeclarationId(2694), @@ -82667,7 +82701,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6361, 6376), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6451, 6466), }); declarations.push(Declaration { id: DeclarationId(2695), @@ -82681,7 +82715,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6405, 6426), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6495, 6518), }); declarations.push(Declaration { id: DeclarationId(2696), @@ -82695,7 +82729,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6431, 6446), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6523, 6544), }); declarations.push(Declaration { id: DeclarationId(2697), @@ -82709,7 +82743,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8043, 8053), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 6549, 6564), }); declarations.push(Declaration { id: DeclarationId(2698), @@ -82723,7 +82757,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8058, 8069), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8177, 8187), }); declarations.push(Declaration { id: DeclarationId(2699), @@ -82737,7 +82771,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8074, 8087), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8192, 8203), }); declarations.push(Declaration { id: DeclarationId(2700), @@ -82751,7 +82785,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8092, 8105), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8208, 8221), }); declarations.push(Declaration { id: DeclarationId(2701), @@ -82765,7 +82799,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8110, 8123), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8226, 8239), }); declarations.push(Declaration { id: DeclarationId(2702), @@ -82779,7 +82813,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8128, 8142), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8244, 8257), }); declarations.push(Declaration { id: DeclarationId(2703), @@ -82793,7 +82827,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8147, 8162), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8262, 8276), }); declarations.push(Declaration { id: DeclarationId(2704), @@ -82807,7 +82841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8904, 8921), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8281, 8296), }); declarations.push(Declaration { id: DeclarationId(2705), @@ -82821,7 +82855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8926, 8936), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9038, 9055), }); declarations.push(Declaration { id: DeclarationId(2706), @@ -82835,11 +82869,25 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 8941, 8945), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9060, 9070), }); declarations.push(Declaration { id: DeclarationId(2707), 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/languages/rust/primitives.dag", 9075, 9079), + }); + declarations.push(Declaration { + id: DeclarationId(2708), + name: None, connective: TypeConnective::Conj { children: vec![ Field { @@ -82880,10 +82928,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9723, 10295), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 9857, 10429), }); declarations.push(Declaration { - id: DeclarationId(2708), + id: DeclarationId(2709), name: None, connective: TypeConnective::Conj { children: vec![ @@ -82913,10 +82961,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10300, 10482), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10434, 10616), }); declarations.push(Declaration { - id: DeclarationId(2709), + id: DeclarationId(2710), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -82933,10 +82981,10 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { value_body: None, refinement: None, nominal_opacity: None, - span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10838, 10857), + span: SourceSpan::new("dsl/extdeps/languages/rust/primitives.dag", 10965, 10984), }); declarations.push(Declaration { - id: DeclarationId(2710), + id: DeclarationId(2711), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -82950,7 +82998,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4233, 4241), }); declarations.push(Declaration { - id: DeclarationId(2711), + id: DeclarationId(2712), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -82969,7 +83017,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4246, 4277), }); declarations.push(Declaration { - id: DeclarationId(2712), + id: DeclarationId(2713), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -82989,12 +83037,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4299, 4319), }); declarations.push(Declaration { - id: DeclarationId(2713), + id: DeclarationId(2714), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "values".to_string(), - ty: DeclarationId(2712), + ty: DeclarationId(2713), }], }, type_params: vec![], @@ -83008,7 +83056,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4282, 4321), }); declarations.push(Declaration { - id: DeclarationId(2714), + id: DeclarationId(2715), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83033,7 +83081,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4326, 4379), }); declarations.push(Declaration { - id: DeclarationId(2715), + id: DeclarationId(2716), name: None, connective: TypeConnective::Conj { children: vec![ @@ -83058,7 +83106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/cron_schedule_model.dag", 4384, 4433), }); declarations.push(Declaration { - id: DeclarationId(2716), + id: DeclarationId(2717), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83072,7 +83120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 847, 851), }); declarations.push(Declaration { - id: DeclarationId(2717), + id: DeclarationId(2718), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83086,7 +83134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 854, 857), }); declarations.push(Declaration { - id: DeclarationId(2718), + id: DeclarationId(2719), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83100,7 +83148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 860, 872), }); declarations.push(Declaration { - id: DeclarationId(2719), + id: DeclarationId(2720), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83120,7 +83168,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1242, 1259), }); declarations.push(Declaration { - id: DeclarationId(2720), + id: DeclarationId(2721), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83139,7 +83187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(2721), + id: DeclarationId(2722), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83153,7 +83201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1309, 1318), }); declarations.push(Declaration { - id: DeclarationId(2722), + id: DeclarationId(2723), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83167,7 +83215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1323, 1332), }); declarations.push(Declaration { - id: DeclarationId(2723), + id: DeclarationId(2724), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83181,7 +83229,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1337, 1350), }); declarations.push(Declaration { - id: DeclarationId(2724), + id: DeclarationId(2725), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83195,7 +83243,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1355, 1367), }); declarations.push(Declaration { - id: DeclarationId(2725), + id: DeclarationId(2726), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83209,7 +83257,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1372, 1385), }); declarations.push(Declaration { - id: DeclarationId(2726), + id: DeclarationId(2727), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83228,7 +83276,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(2727), + id: DeclarationId(2728), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83242,7 +83290,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1677, 1685), }); declarations.push(Declaration { - id: DeclarationId(2728), + id: DeclarationId(2729), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83256,7 +83304,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1688, 1697), }); declarations.push(Declaration { - id: DeclarationId(2729), + id: DeclarationId(2730), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83270,7 +83318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1700, 1709), }); declarations.push(Declaration { - id: DeclarationId(2730), + id: DeclarationId(2731), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83290,7 +83338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 829, 850), }); declarations.push(Declaration { - id: DeclarationId(2731), + id: DeclarationId(2732), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83310,7 +83358,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 859, 868), }); declarations.push(Declaration { - id: DeclarationId(2732), + id: DeclarationId(2733), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -83336,7 +83384,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 876, 895), }); declarations.push(Declaration { - id: DeclarationId(2733), + id: DeclarationId(2734), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83355,7 +83403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(2734), + id: DeclarationId(2735), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83369,7 +83417,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1102, 1110), }); declarations.push(Declaration { - id: DeclarationId(2735), + id: DeclarationId(2736), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83383,7 +83431,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1113, 1122), }); declarations.push(Declaration { - id: DeclarationId(2736), + id: DeclarationId(2737), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83397,7 +83445,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1125, 1133), }); declarations.push(Declaration { - id: DeclarationId(2737), + id: DeclarationId(2738), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83417,7 +83465,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1291, 1303), }); declarations.push(Declaration { - id: DeclarationId(2738), + id: DeclarationId(2739), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83437,17 +83485,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1312, 1324), }); declarations.push(Declaration { - id: DeclarationId(2739), + id: DeclarationId(2740), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), - ty: DeclarationId(2737), + ty: DeclarationId(2738), }, Field { label: "paths".to_string(), - ty: DeclarationId(2738), + ty: DeclarationId(2739), }, ], }, @@ -83462,7 +83510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1274, 1326), }); declarations.push(Declaration { - id: DeclarationId(2740), + id: DeclarationId(2741), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83482,7 +83530,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1355, 1367), }); declarations.push(Declaration { - id: DeclarationId(2741), + id: DeclarationId(2742), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83502,17 +83550,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1376, 1401), }); declarations.push(Declaration { - id: DeclarationId(2742), + id: DeclarationId(2743), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "branches".to_string(), - ty: DeclarationId(2740), + ty: DeclarationId(2741), }, Field { label: "types".to_string(), - ty: DeclarationId(2741), + ty: DeclarationId(2742), }, ], }, @@ -83527,7 +83575,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1331, 1403), }); declarations.push(Declaration { - id: DeclarationId(2743), + id: DeclarationId(2744), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83546,7 +83594,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1408, 1439), }); declarations.push(Declaration { - id: DeclarationId(2744), + id: DeclarationId(2745), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83566,12 +83614,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1471, 1490), }); declarations.push(Declaration { - id: DeclarationId(2745), + id: DeclarationId(2746), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), - ty: DeclarationId(2744), + ty: DeclarationId(2745), }], }, type_params: vec![], @@ -83585,7 +83633,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1444, 1492), }); declarations.push(Declaration { - id: DeclarationId(2746), + id: DeclarationId(2747), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83605,12 +83653,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1520, 1539), }); declarations.push(Declaration { - id: DeclarationId(2747), + id: DeclarationId(2748), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "inputs".to_string(), - ty: DeclarationId(2746), + ty: DeclarationId(2747), }], }, type_params: vec![], @@ -83624,7 +83672,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1497, 1541), }); declarations.push(Declaration { - id: DeclarationId(2748), + id: DeclarationId(2749), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83638,7 +83686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1572, 1578), }); declarations.push(Declaration { - id: DeclarationId(2749), + id: DeclarationId(2750), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83652,7 +83700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1583, 1594), }); declarations.push(Declaration { - id: DeclarationId(2750), + id: DeclarationId(2751), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83666,7 +83714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1599, 1607), }); declarations.push(Declaration { - id: DeclarationId(2751), + id: DeclarationId(2752), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83680,7 +83728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1612, 1618), }); declarations.push(Declaration { - id: DeclarationId(2752), + id: DeclarationId(2753), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83699,7 +83747,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(2753), + id: DeclarationId(2754), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83718,7 +83766,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(2754), + id: DeclarationId(2755), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83732,7 +83780,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1769, 1780), }); declarations.push(Declaration { - id: DeclarationId(2755), + id: DeclarationId(2756), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83746,7 +83794,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1783, 1795), }); declarations.push(Declaration { - id: DeclarationId(2756), + id: DeclarationId(2757), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83760,7 +83808,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1798, 1809), }); declarations.push(Declaration { - id: DeclarationId(2757), + id: DeclarationId(2758), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83774,7 +83822,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1812, 1828), }); declarations.push(Declaration { - id: DeclarationId(2758), + id: DeclarationId(2759), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83788,7 +83836,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3804, 3813), }); declarations.push(Declaration { - id: DeclarationId(2759), + id: DeclarationId(2760), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83802,7 +83850,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3816, 3824), }); declarations.push(Declaration { - id: DeclarationId(2760), + id: DeclarationId(2761), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -83816,7 +83864,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 3827, 3840), }); declarations.push(Declaration { - id: DeclarationId(2761), + id: DeclarationId(2762), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83835,7 +83883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(2762), + id: DeclarationId(2763), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83855,7 +83903,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4392, 4402), }); declarations.push(Declaration { - id: DeclarationId(2763), + id: DeclarationId(2764), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -83875,7 +83923,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4412, 4424), }); declarations.push(Declaration { - id: DeclarationId(2764), + id: DeclarationId(2765), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -83901,7 +83949,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4432, 4451), }); declarations.push(Declaration { - id: DeclarationId(2765), + id: DeclarationId(2766), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83920,7 +83968,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(2766), + id: DeclarationId(2767), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83939,7 +83987,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(2767), + id: DeclarationId(2768), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83958,7 +84006,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(2768), + id: DeclarationId(2769), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -83977,7 +84025,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(2769), + id: DeclarationId(2770), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -83996,7 +84044,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4792, 4827), }); declarations.push(Declaration { - id: DeclarationId(2770), + id: DeclarationId(2771), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -84016,12 +84064,12 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4853, 4865), }); declarations.push(Declaration { - id: DeclarationId(2771), + id: DeclarationId(2772), name: None, connective: TypeConnective::Conj { children: vec![Field { label: "labels".to_string(), - ty: DeclarationId(2770), + ty: DeclarationId(2771), }], }, type_params: vec![], @@ -84035,7 +84083,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4832, 4867), }); declarations.push(Declaration { - id: DeclarationId(2772), + id: DeclarationId(2773), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84049,7 +84097,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4890, 4902), }); declarations.push(Declaration { - id: DeclarationId(2773), + id: DeclarationId(2774), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84063,7 +84111,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4907, 4917), }); declarations.push(Declaration { - id: DeclarationId(2774), + id: DeclarationId(2775), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84077,7 +84125,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4922, 4932), }); declarations.push(Declaration { - id: DeclarationId(2775), + id: DeclarationId(2776), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84091,7 +84139,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4937, 4948), }); declarations.push(Declaration { - id: DeclarationId(2776), + id: DeclarationId(2777), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84105,7 +84153,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4953, 4960), }); declarations.push(Declaration { - id: DeclarationId(2777), + id: DeclarationId(2778), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84119,7 +84167,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4965, 4978), }); declarations.push(Declaration { - id: DeclarationId(2778), + id: DeclarationId(2779), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84138,7 +84186,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(2779), + id: DeclarationId(2780), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84164,7 +84212,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5222, 5241), }); declarations.push(Declaration { - id: DeclarationId(2780), + id: DeclarationId(2781), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84183,7 +84231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(2781), + id: DeclarationId(2782), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84202,7 +84250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(2782), + id: DeclarationId(2783), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84221,13 +84269,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(2783), + id: DeclarationId(2784), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), - ty: DeclarationId(2778), + ty: DeclarationId(2779), }, Field { label: "run".to_string(), @@ -84239,15 +84287,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "env".to_string(), - ty: DeclarationId(2779), + ty: DeclarationId(2780), }, Field { label: "working_directory".to_string(), - ty: DeclarationId(2780), + ty: DeclarationId(2781), }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2781), + ty: DeclarationId(2782), }, Field { label: "continue_on_error".to_string(), @@ -84255,7 +84303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2782), + ty: DeclarationId(2783), }, ], }, @@ -84270,7 +84318,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5137, 5370), }); declarations.push(Declaration { - id: DeclarationId(2784), + id: DeclarationId(2785), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84289,7 +84337,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(2785), + id: DeclarationId(2786), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84315,7 +84363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5442, 5461), }); declarations.push(Declaration { - id: DeclarationId(2786), + id: DeclarationId(2787), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -84341,7 +84389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5474, 5493), }); declarations.push(Declaration { - id: DeclarationId(2787), + id: DeclarationId(2788), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84360,7 +84408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(2788), + id: DeclarationId(2789), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84379,13 +84427,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(2789), + id: DeclarationId(2790), name: None, connective: TypeConnective::Conj { children: vec![ Field { label: "name".to_string(), - ty: DeclarationId(2784), + ty: DeclarationId(2785), }, Field { label: "uses".to_string(), @@ -84393,15 +84441,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "with".to_string(), - ty: DeclarationId(2785), + ty: DeclarationId(2786), }, Field { label: "env".to_string(), - ty: DeclarationId(2786), + ty: DeclarationId(2787), }, Field { label: "if_condition".to_string(), - ty: DeclarationId(2787), + ty: DeclarationId(2788), }, Field { label: "continue_on_error".to_string(), @@ -84409,7 +84457,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "timeout_minutes".to_string(), - ty: DeclarationId(2788), + ty: DeclarationId(2789), }, ], }, @@ -84424,7 +84472,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5375, 5588), }); declarations.push(Declaration { - id: DeclarationId(2790), + id: DeclarationId(2791), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84438,7 +84486,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5607, 5611), }); declarations.push(Declaration { - id: DeclarationId(2791), + id: DeclarationId(2792), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84452,7 +84500,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5614, 5616), }); declarations.push(Declaration { - id: DeclarationId(2792), + id: DeclarationId(2793), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84466,7 +84514,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5619, 5623), }); declarations.push(Declaration { - id: DeclarationId(2793), + id: DeclarationId(2794), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84480,7 +84528,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5626, 5632), }); declarations.push(Declaration { - id: DeclarationId(2794), + id: DeclarationId(2795), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84494,7 +84542,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5635, 5638), }); declarations.push(Declaration { - id: DeclarationId(2795), + id: DeclarationId(2796), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84513,7 +84561,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(2796), + id: DeclarationId(2797), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84532,7 +84580,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(2797), + id: DeclarationId(2798), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84551,7 +84599,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(2798), + id: DeclarationId(2799), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84561,15 +84609,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2795), + ty: DeclarationId(2796), }, Field { label: "line".to_string(), - ty: DeclarationId(2796), + ty: DeclarationId(2797), }, Field { label: "col".to_string(), - ty: DeclarationId(2797), + ty: DeclarationId(2798), }, ], }, @@ -84584,7 +84632,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5960, 6033), }); declarations.push(Declaration { - id: DeclarationId(2799), + id: DeclarationId(2800), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84603,7 +84651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(2800), + id: DeclarationId(2801), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84622,7 +84670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(2801), + id: DeclarationId(2802), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84641,7 +84689,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(2802), + id: DeclarationId(2803), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84651,15 +84699,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2799), + ty: DeclarationId(2800), }, Field { label: "line".to_string(), - ty: DeclarationId(2800), + ty: DeclarationId(2801), }, Field { label: "col".to_string(), - ty: DeclarationId(2801), + ty: DeclarationId(2802), }, ], }, @@ -84674,7 +84722,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6038, 6113), }); declarations.push(Declaration { - id: DeclarationId(2803), + id: DeclarationId(2804), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84693,7 +84741,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(2804), + id: DeclarationId(2805), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84712,7 +84760,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(2805), + id: DeclarationId(2806), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84731,7 +84779,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(2806), + id: DeclarationId(2807), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84741,15 +84789,15 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "file".to_string(), - ty: DeclarationId(2803), + ty: DeclarationId(2804), }, Field { label: "line".to_string(), - ty: DeclarationId(2804), + ty: DeclarationId(2805), }, Field { label: "col".to_string(), - ty: DeclarationId(2805), + ty: DeclarationId(2806), }, ], }, @@ -84764,7 +84812,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6118, 6192), }); declarations.push(Declaration { - id: DeclarationId(2807), + id: DeclarationId(2808), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84783,7 +84831,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6197, 6230), }); declarations.push(Declaration { - id: DeclarationId(2808), + id: DeclarationId(2809), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84797,7 +84845,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6235, 6253), }); declarations.push(Declaration { - id: DeclarationId(2809), + id: DeclarationId(2810), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84822,7 +84870,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6258, 6299), }); declarations.push(Declaration { - id: DeclarationId(2810), + id: DeclarationId(2811), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84841,7 +84889,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6304, 6329), }); declarations.push(Declaration { - id: DeclarationId(2811), + id: DeclarationId(2812), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -84860,7 +84908,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6334, 6364), }); declarations.push(Declaration { - id: DeclarationId(2812), + id: DeclarationId(2813), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84879,7 +84927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(2813), + id: DeclarationId(2814), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84893,7 +84941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "retention_days".to_string(), - ty: DeclarationId(2812), + ty: DeclarationId(2813), }, Field { label: "if_no_files_found".to_string(), @@ -84912,7 +84960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7117, 7217), }); declarations.push(Declaration { - id: DeclarationId(2814), + id: DeclarationId(2815), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -84931,7 +84979,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(2815), + id: DeclarationId(2816), name: None, connective: TypeConnective::Conj { children: vec![ @@ -84941,7 +84989,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, Field { label: "path".to_string(), - ty: DeclarationId(2814), + ty: DeclarationId(2815), }, ], }, @@ -84956,7 +85004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7222, 7262), }); declarations.push(Declaration { - id: DeclarationId(2816), + id: DeclarationId(2817), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84970,7 +85018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7292, 7296), }); declarations.push(Declaration { - id: DeclarationId(2817), + id: DeclarationId(2818), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84984,7 +85032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7299, 7307), }); declarations.push(Declaration { - id: DeclarationId(2818), + id: DeclarationId(2819), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -84998,7 +85046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7310, 7316), }); declarations.push(Declaration { - id: DeclarationId(2819), + id: DeclarationId(2820), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), @@ -85018,7 +85066,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7778, 7790), }); declarations.push(Declaration { - id: DeclarationId(2820), + id: DeclarationId(2821), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85029,7 +85077,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { }, TemplateArgument { parameter: DeclarationId(139), - value: DeclarationId(2819), + value: DeclarationId(2820), }, ], }, @@ -85044,7 +85092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7766, 7791), }); declarations.push(Declaration { - id: DeclarationId(2821), + id: DeclarationId(2822), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85070,13 +85118,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7808, 7827), }); declarations.push(Declaration { - id: DeclarationId(2822), + id: DeclarationId(2823), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), arguments: vec![TemplateArgument { parameter: DeclarationId(685), - value: DeclarationId(2821), + value: DeclarationId(2822), }], }, type_params: vec![], @@ -85090,7 +85138,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7803, 7828), }); declarations.push(Declaration { - id: DeclarationId(2823), + id: DeclarationId(2824), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(137), @@ -85116,13 +85164,13 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7845, 7864), }); declarations.push(Declaration { - id: DeclarationId(2824), + id: DeclarationId(2825), name: None, connective: TypeConnective::Instantiation { template: DeclarationId(684), arguments: vec![TemplateArgument { parameter: DeclarationId(685), - value: DeclarationId(2823), + value: DeclarationId(2824), }], }, type_params: vec![], @@ -85136,7 +85184,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7840, 7865), }); declarations.push(Declaration { - id: DeclarationId(2825), + id: DeclarationId(2826), name: None, connective: TypeConnective::Cardinality( CardinalityPayload::new_unchecked_bypassing_idempotence( @@ -85155,7 +85203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { - id: DeclarationId(2826), + id: DeclarationId(2827), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85169,7 +85217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8060, 8067), }); declarations.push(Declaration { - id: DeclarationId(2827), + id: DeclarationId(2828), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85183,7 +85231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8072, 8079), }); declarations.push(Declaration { - id: DeclarationId(2828), + id: DeclarationId(2829), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85197,7 +85245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8084, 8093), }); declarations.push(Declaration { - id: DeclarationId(2829), + id: DeclarationId(2830), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85211,7 +85259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8098, 8105), }); declarations.push(Declaration { - id: DeclarationId(2830), + id: DeclarationId(2831), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85225,7 +85273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8110, 8118), }); declarations.push(Declaration { - id: DeclarationId(2831), + id: DeclarationId(2832), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85239,7 +85287,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 8123, 8137), }); declarations.push(Declaration { - id: DeclarationId(2832), + id: DeclarationId(2833), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85258,7 +85306,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2833), + id: DeclarationId(2834), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85272,17 +85320,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2834), + id: DeclarationId(2835), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2832), + ty: DeclarationId(2833), }, Field { label: "None".to_string(), - ty: DeclarationId(2833), + ty: DeclarationId(2834), }, ], }, @@ -85297,7 +85345,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17832, 17834), }); declarations.push(Declaration { - id: DeclarationId(2835), + id: DeclarationId(2836), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85316,7 +85364,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2836), + id: DeclarationId(2837), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85330,17 +85378,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2837), + id: DeclarationId(2838), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2835), + ty: DeclarationId(2836), }, Field { label: "None".to_string(), - ty: DeclarationId(2836), + ty: DeclarationId(2837), }, ], }, @@ -85355,7 +85403,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 17851, 17853), }); declarations.push(Declaration { - id: DeclarationId(2838), + id: DeclarationId(2839), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85374,7 +85422,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2839), + id: DeclarationId(2840), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85388,17 +85436,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2840), + id: DeclarationId(2841), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2838), + ty: DeclarationId(2839), }, Field { label: "None".to_string(), - ty: DeclarationId(2839), + ty: DeclarationId(2840), }, ], }, @@ -85413,7 +85461,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 18997, 18999), }); declarations.push(Declaration { - id: DeclarationId(2841), + id: DeclarationId(2842), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85432,7 +85480,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2842), + id: DeclarationId(2843), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85446,17 +85494,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2843), + id: DeclarationId(2844), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2841), + ty: DeclarationId(2842), }, Field { label: "None".to_string(), - ty: DeclarationId(2842), + ty: DeclarationId(2843), }, ], }, @@ -85471,7 +85519,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 19047, 19049), }); declarations.push(Declaration { - id: DeclarationId(2844), + id: DeclarationId(2845), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85490,7 +85538,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2845), + id: DeclarationId(2846), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85504,17 +85552,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2846), + id: DeclarationId(2847), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2844), + ty: DeclarationId(2845), }, Field { label: "None".to_string(), - ty: DeclarationId(2845), + ty: DeclarationId(2846), }, ], }, @@ -85529,7 +85577,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23544, 23565), }); declarations.push(Declaration { - id: DeclarationId(2847), + id: DeclarationId(2848), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85548,7 +85596,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2848), + id: DeclarationId(2849), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85562,17 +85610,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2849), + id: DeclarationId(2850), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2847), + ty: DeclarationId(2848), }, Field { label: "None".to_string(), - ty: DeclarationId(2848), + ty: DeclarationId(2849), }, ], }, @@ -85587,7 +85635,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23580, 23590), }); declarations.push(Declaration { - id: DeclarationId(2850), + id: DeclarationId(2851), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85606,7 +85654,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2851), + id: DeclarationId(2852), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85620,17 +85668,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2852), + id: DeclarationId(2853), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2850), + ty: DeclarationId(2851), }, Field { label: "None".to_string(), - ty: DeclarationId(2851), + ty: DeclarationId(2852), }, ], }, @@ -85645,7 +85693,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/algebra.dag", 23835, 23839), }); declarations.push(Declaration { - id: DeclarationId(2853), + id: DeclarationId(2854), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85664,7 +85712,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2854), + id: DeclarationId(2855), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85678,17 +85726,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2855), + id: DeclarationId(2856), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2853), + ty: DeclarationId(2854), }, Field { label: "None".to_string(), - ty: DeclarationId(2854), + ty: DeclarationId(2855), }, ], }, @@ -85703,7 +85751,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 3781, 3785), }); declarations.push(Declaration { - id: DeclarationId(2856), + id: DeclarationId(2857), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85722,7 +85770,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2857), + id: DeclarationId(2858), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85736,17 +85784,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2858), + id: DeclarationId(2859), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2856), + ty: DeclarationId(2857), }, Field { label: "None".to_string(), - ty: DeclarationId(2857), + ty: DeclarationId(2858), }, ], }, @@ -85761,7 +85809,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 4264, 4271), }); declarations.push(Declaration { - id: DeclarationId(2859), + id: DeclarationId(2860), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85780,7 +85828,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2860), + id: DeclarationId(2861), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85794,17 +85842,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2861), + id: DeclarationId(2862), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2859), + ty: DeclarationId(2860), }, Field { label: "None".to_string(), - ty: DeclarationId(2860), + ty: DeclarationId(2861), }, ], }, @@ -85819,7 +85867,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 6172, 6179), }); declarations.push(Declaration { - id: DeclarationId(2862), + id: DeclarationId(2863), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85838,7 +85886,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(2863), + id: DeclarationId(2864), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85852,17 +85900,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(2864), + id: DeclarationId(2865), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2862), + ty: DeclarationId(2863), }, Field { label: "None".to_string(), - ty: DeclarationId(2863), + ty: DeclarationId(2864), }, ], }, @@ -85877,7 +85925,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 16948, 16968), }); declarations.push(Declaration { - id: DeclarationId(2865), + id: DeclarationId(2866), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85896,7 +85944,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(2866), + id: DeclarationId(2867), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85910,17 +85958,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(2867), + id: DeclarationId(2868), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2865), + ty: DeclarationId(2866), }, Field { label: "None".to_string(), - ty: DeclarationId(2866), + ty: DeclarationId(2867), }, ], }, @@ -85935,7 +85983,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 17604, 17611), }); declarations.push(Declaration { - id: DeclarationId(2868), + id: DeclarationId(2869), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -85954,7 +86002,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(2869), + id: DeclarationId(2870), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -85968,17 +86016,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(2870), + id: DeclarationId(2871), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2868), + ty: DeclarationId(2869), }, Field { label: "None".to_string(), - ty: DeclarationId(2869), + ty: DeclarationId(2870), }, ], }, @@ -85993,7 +86041,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21364, 21374), }); declarations.push(Declaration { - id: DeclarationId(2871), + id: DeclarationId(2872), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86012,7 +86060,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(2872), + id: DeclarationId(2873), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86026,17 +86074,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(2873), + id: DeclarationId(2874), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2871), + ty: DeclarationId(2872), }, Field { label: "None".to_string(), - ty: DeclarationId(2872), + ty: DeclarationId(2873), }, ], }, @@ -86051,7 +86099,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21499, 21506), }); declarations.push(Declaration { - id: DeclarationId(2874), + id: DeclarationId(2875), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86070,7 +86118,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(2875), + id: DeclarationId(2876), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86084,17 +86132,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(2876), + id: DeclarationId(2877), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2874), + ty: DeclarationId(2875), }, Field { label: "None".to_string(), - ty: DeclarationId(2875), + ty: DeclarationId(2876), }, ], }, @@ -86109,7 +86157,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 21573, 21577), }); declarations.push(Declaration { - id: DeclarationId(2877), + id: DeclarationId(2878), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86128,7 +86176,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(2878), + id: DeclarationId(2879), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86142,17 +86190,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(2879), + id: DeclarationId(2880), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2877), + ty: DeclarationId(2878), }, Field { label: "None".to_string(), - ty: DeclarationId(2878), + ty: DeclarationId(2879), }, ], }, @@ -86167,7 +86215,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23344, 23351), }); declarations.push(Declaration { - id: DeclarationId(2880), + id: DeclarationId(2881), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86186,7 +86234,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(2881), + id: DeclarationId(2882), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86200,17 +86248,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(2882), + id: DeclarationId(2883), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2880), + ty: DeclarationId(2881), }, Field { label: "None".to_string(), - ty: DeclarationId(2881), + ty: DeclarationId(2882), }, ], }, @@ -86225,7 +86273,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23856, 23863), }); declarations.push(Declaration { - id: DeclarationId(2883), + id: DeclarationId(2884), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86244,7 +86292,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(2884), + id: DeclarationId(2885), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86258,17 +86306,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(2885), + id: DeclarationId(2886), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2883), + ty: DeclarationId(2884), }, Field { label: "None".to_string(), - ty: DeclarationId(2884), + ty: DeclarationId(2885), }, ], }, @@ -86283,7 +86331,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 23950, 23957), }); declarations.push(Declaration { - id: DeclarationId(2886), + id: DeclarationId(2887), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86302,7 +86350,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(2887), + id: DeclarationId(2888), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86316,17 +86364,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(2888), + id: DeclarationId(2889), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2886), + ty: DeclarationId(2887), }, Field { label: "None".to_string(), - ty: DeclarationId(2887), + ty: DeclarationId(2888), }, ], }, @@ -86341,7 +86389,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24180, 24195), }); declarations.push(Declaration { - id: DeclarationId(2889), + id: DeclarationId(2890), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86360,7 +86408,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(2890), + id: DeclarationId(2891), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86374,17 +86422,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(2891), + id: DeclarationId(2892), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2889), + ty: DeclarationId(2890), }, Field { label: "None".to_string(), - ty: DeclarationId(2890), + ty: DeclarationId(2891), }, ], }, @@ -86399,7 +86447,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24206, 24219), }); declarations.push(Declaration { - id: DeclarationId(2892), + id: DeclarationId(2893), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86418,7 +86466,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(2893), + id: DeclarationId(2894), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86432,17 +86480,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(2894), + id: DeclarationId(2895), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2892), + ty: DeclarationId(2893), }, Field { label: "None".to_string(), - ty: DeclarationId(2893), + ty: DeclarationId(2894), }, ], }, @@ -86457,7 +86505,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24235, 24248), }); declarations.push(Declaration { - id: DeclarationId(2895), + id: DeclarationId(2896), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86476,7 +86524,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(2896), + id: DeclarationId(2897), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86490,17 +86538,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(2897), + id: DeclarationId(2898), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2895), + ty: DeclarationId(2896), }, Field { label: "None".to_string(), - ty: DeclarationId(2896), + ty: DeclarationId(2897), }, ], }, @@ -86515,7 +86563,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/std/types.dag", 24358, 24365), }); declarations.push(Declaration { - id: DeclarationId(2898), + id: DeclarationId(2899), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86534,7 +86582,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2899), + id: DeclarationId(2900), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86548,17 +86596,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2900), + id: DeclarationId(2901), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2898), + ty: DeclarationId(2899), }, Field { label: "None".to_string(), - ty: DeclarationId(2899), + ty: DeclarationId(2900), }, ], }, @@ -86573,7 +86621,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 11753, 11760), }); declarations.push(Declaration { - id: DeclarationId(2901), + id: DeclarationId(2902), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86592,7 +86640,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2902), + id: DeclarationId(2903), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86606,17 +86654,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2903), + id: DeclarationId(2904), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2901), + ty: DeclarationId(2902), }, Field { label: "None".to_string(), - ty: DeclarationId(2902), + ty: DeclarationId(2903), }, ], }, @@ -86631,7 +86679,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21031, 21059), }); declarations.push(Declaration { - id: DeclarationId(2904), + id: DeclarationId(2905), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86650,7 +86698,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(2905), + id: DeclarationId(2906), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86664,17 +86712,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(2906), + id: DeclarationId(2907), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2904), + ty: DeclarationId(2905), }, Field { label: "None".to_string(), - ty: DeclarationId(2905), + ty: DeclarationId(2906), }, ], }, @@ -86689,7 +86737,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 21211, 21239), }); declarations.push(Declaration { - id: DeclarationId(2907), + id: DeclarationId(2908), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86708,7 +86756,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(2908), + id: DeclarationId(2909), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86722,17 +86770,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(2909), + id: DeclarationId(2910), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2907), + ty: DeclarationId(2908), }, Field { label: "None".to_string(), - ty: DeclarationId(2908), + ty: DeclarationId(2909), }, ], }, @@ -86747,7 +86795,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 29695, 29706), }); declarations.push(Declaration { - id: DeclarationId(2910), + id: DeclarationId(2911), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86766,7 +86814,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2911), + id: DeclarationId(2912), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86780,17 +86828,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2912), + id: DeclarationId(2913), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2910), + ty: DeclarationId(2911), }, Field { label: "None".to_string(), - ty: DeclarationId(2911), + ty: DeclarationId(2912), }, ], }, @@ -86805,7 +86853,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30432, 30439), }); declarations.push(Declaration { - id: DeclarationId(2913), + id: DeclarationId(2914), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86824,7 +86872,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2914), + id: DeclarationId(2915), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86838,17 +86886,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2915), + id: DeclarationId(2916), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2913), + ty: DeclarationId(2914), }, Field { label: "None".to_string(), - ty: DeclarationId(2914), + ty: DeclarationId(2915), }, ], }, @@ -86863,7 +86911,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/effects.dag", 30662, 30669), }); declarations.push(Declaration { - id: DeclarationId(2916), + id: DeclarationId(2917), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86882,7 +86930,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2917), + id: DeclarationId(2918), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86896,17 +86944,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2918), + id: DeclarationId(2919), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2916), + ty: DeclarationId(2917), }, Field { label: "None".to_string(), - ty: DeclarationId(2917), + ty: DeclarationId(2918), }, ], }, @@ -86921,7 +86969,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22013, 22021), }); declarations.push(Declaration { - id: DeclarationId(2919), + id: DeclarationId(2920), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86940,7 +86988,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2920), + id: DeclarationId(2921), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -86954,17 +87002,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2921), + id: DeclarationId(2922), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2919), + ty: DeclarationId(2920), }, Field { label: "None".to_string(), - ty: DeclarationId(2920), + ty: DeclarationId(2921), }, ], }, @@ -86979,7 +87027,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22070, 22079), }); declarations.push(Declaration { - id: DeclarationId(2922), + id: DeclarationId(2923), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -86998,7 +87046,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2923), + id: DeclarationId(2924), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87012,17 +87060,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2924), + id: DeclarationId(2925), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2922), + ty: DeclarationId(2923), }, Field { label: "None".to_string(), - ty: DeclarationId(2923), + ty: DeclarationId(2924), }, ], }, @@ -87037,7 +87085,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22145, 22154), }); declarations.push(Declaration { - id: DeclarationId(2925), + id: DeclarationId(2926), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87056,7 +87104,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2926), + id: DeclarationId(2927), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87070,17 +87118,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2927), + id: DeclarationId(2928), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2925), + ty: DeclarationId(2926), }, Field { label: "None".to_string(), - ty: DeclarationId(2926), + ty: DeclarationId(2927), }, ], }, @@ -87095,7 +87143,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 22531, 22543), }); declarations.push(Declaration { - id: DeclarationId(2928), + id: DeclarationId(2929), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87114,7 +87162,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2929), + id: DeclarationId(2930), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87128,17 +87176,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2930), + id: DeclarationId(2931), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2928), + ty: DeclarationId(2929), }, Field { label: "None".to_string(), - ty: DeclarationId(2929), + ty: DeclarationId(2930), }, ], }, @@ -87153,7 +87201,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23406, 23418), }); declarations.push(Declaration { - id: DeclarationId(2931), + id: DeclarationId(2932), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87172,7 +87220,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2932), + id: DeclarationId(2933), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87186,17 +87234,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2933), + id: DeclarationId(2934), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2931), + ty: DeclarationId(2932), }, Field { label: "None".to_string(), - ty: DeclarationId(2932), + ty: DeclarationId(2933), }, ], }, @@ -87211,7 +87259,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 23729, 23744), }); declarations.push(Declaration { - id: DeclarationId(2934), + id: DeclarationId(2935), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87230,7 +87278,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2935), + id: DeclarationId(2936), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87244,17 +87292,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2936), + id: DeclarationId(2937), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2934), + ty: DeclarationId(2935), }, Field { label: "None".to_string(), - ty: DeclarationId(2935), + ty: DeclarationId(2936), }, ], }, @@ -87269,7 +87317,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 592, 599), }); declarations.push(Declaration { - id: DeclarationId(2937), + id: DeclarationId(2938), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87288,7 +87336,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(2938), + id: DeclarationId(2939), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87302,17 +87350,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(2939), + id: DeclarationId(2940), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2937), + ty: DeclarationId(2938), }, Field { label: "None".to_string(), - ty: DeclarationId(2938), + ty: DeclarationId(2939), }, ], }, @@ -87327,7 +87375,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11525, 11532), }); declarations.push(Declaration { - id: DeclarationId(2940), + id: DeclarationId(2941), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87346,7 +87394,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(2941), + id: DeclarationId(2942), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87360,17 +87408,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(2942), + id: DeclarationId(2943), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2940), + ty: DeclarationId(2941), }, Field { label: "None".to_string(), - ty: DeclarationId(2941), + ty: DeclarationId(2942), }, ], }, @@ -87385,7 +87433,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11650, 11664), }); declarations.push(Declaration { - id: DeclarationId(2943), + id: DeclarationId(2944), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87404,7 +87452,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(2944), + id: DeclarationId(2945), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87418,17 +87466,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(2945), + id: DeclarationId(2946), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2943), + ty: DeclarationId(2944), }, Field { label: "None".to_string(), - ty: DeclarationId(2944), + ty: DeclarationId(2945), }, ], }, @@ -87443,7 +87491,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11677, 11691), }); declarations.push(Declaration { - id: DeclarationId(2946), + id: DeclarationId(2947), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87462,7 +87510,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(2947), + id: DeclarationId(2948), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87476,17 +87524,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(2948), + id: DeclarationId(2949), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2946), + ty: DeclarationId(2947), }, Field { label: "None".to_string(), - ty: DeclarationId(2947), + ty: DeclarationId(2948), }, ], }, @@ -87501,7 +87549,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11706, 11716), }); declarations.push(Declaration { - id: DeclarationId(2949), + id: DeclarationId(2950), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87520,7 +87568,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(2950), + id: DeclarationId(2951), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87534,17 +87582,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(2951), + id: DeclarationId(2952), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2949), + ty: DeclarationId(2950), }, Field { label: "None".to_string(), - ty: DeclarationId(2950), + ty: DeclarationId(2951), }, ], }, @@ -87559,7 +87607,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 11736, 11751), }); declarations.push(Declaration { - id: DeclarationId(2952), + id: DeclarationId(2953), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87578,7 +87626,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(2953), + id: DeclarationId(2954), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87592,17 +87640,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(2954), + id: DeclarationId(2955), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2952), + ty: DeclarationId(2953), }, Field { label: "None".to_string(), - ty: DeclarationId(2953), + ty: DeclarationId(2954), }, ], }, @@ -87617,7 +87665,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 15194, 15209), }); declarations.push(Declaration { - id: DeclarationId(2955), + id: DeclarationId(2956), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87636,7 +87684,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(2956), + id: DeclarationId(2957), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87650,17 +87698,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(2957), + id: DeclarationId(2958), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2955), + ty: DeclarationId(2956), }, Field { label: "None".to_string(), - ty: DeclarationId(2956), + ty: DeclarationId(2957), }, ], }, @@ -87675,7 +87723,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18243, 18258), }); declarations.push(Declaration { - id: DeclarationId(2958), + id: DeclarationId(2959), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87694,7 +87742,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(2959), + id: DeclarationId(2960), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87708,17 +87756,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(2960), + id: DeclarationId(2961), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2958), + ty: DeclarationId(2959), }, Field { label: "None".to_string(), - ty: DeclarationId(2959), + ty: DeclarationId(2960), }, ], }, @@ -87733,7 +87781,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 18732, 18756), }); declarations.push(Declaration { - id: DeclarationId(2961), + id: DeclarationId(2962), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87752,7 +87800,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(2962), + id: DeclarationId(2963), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87766,17 +87814,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(2963), + id: DeclarationId(2964), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2961), + ty: DeclarationId(2962), }, Field { label: "None".to_string(), - ty: DeclarationId(2962), + ty: DeclarationId(2963), }, ], }, @@ -87791,7 +87839,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19310, 19325), }); declarations.push(Declaration { - id: DeclarationId(2964), + id: DeclarationId(2965), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87810,7 +87858,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(2965), + id: DeclarationId(2966), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87824,17 +87872,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(2966), + id: DeclarationId(2967), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2964), + ty: DeclarationId(2965), }, Field { label: "None".to_string(), - ty: DeclarationId(2965), + ty: DeclarationId(2966), }, ], }, @@ -87849,7 +87897,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/substrate.dag", 19348, 19370), }); declarations.push(Declaration { - id: DeclarationId(2967), + id: DeclarationId(2968), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87868,7 +87916,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(2968), + id: DeclarationId(2969), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87882,17 +87930,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(2969), + id: DeclarationId(2970), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2967), + ty: DeclarationId(2968), }, Field { label: "None".to_string(), - ty: DeclarationId(2968), + ty: DeclarationId(2969), }, ], }, @@ -87907,7 +87955,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6780, 6801), }); declarations.push(Declaration { - id: DeclarationId(2970), + id: DeclarationId(2971), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87926,7 +87974,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2971), + id: DeclarationId(2972), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87940,17 +87988,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2972), + id: DeclarationId(2973), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2970), + ty: DeclarationId(2971), }, Field { label: "None".to_string(), - ty: DeclarationId(2971), + ty: DeclarationId(2972), }, ], }, @@ -87965,7 +88013,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6816, 6826), }); declarations.push(Declaration { - id: DeclarationId(2973), + id: DeclarationId(2974), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -87984,7 +88032,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2974), + id: DeclarationId(2975), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -87998,17 +88046,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2975), + id: DeclarationId(2976), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2973), + ty: DeclarationId(2974), }, Field { label: "None".to_string(), - ty: DeclarationId(2974), + ty: DeclarationId(2975), }, ], }, @@ -88023,7 +88071,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 6856, 6860), }); declarations.push(Declaration { - id: DeclarationId(2976), + id: DeclarationId(2977), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88042,7 +88090,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2977), + id: DeclarationId(2978), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88056,17 +88104,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2978), + id: DeclarationId(2979), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2976), + ty: DeclarationId(2977), }, Field { label: "None".to_string(), - ty: DeclarationId(2977), + ty: DeclarationId(2978), }, ], }, @@ -88081,7 +88129,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/algebra.dag", 7429, 7436), }); declarations.push(Declaration { - id: DeclarationId(2979), + id: DeclarationId(2980), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88100,7 +88148,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2980), + id: DeclarationId(2981), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88114,17 +88162,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2981), + id: DeclarationId(2982), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2979), + ty: DeclarationId(2980), }, Field { label: "None".to_string(), - ty: DeclarationId(2980), + ty: DeclarationId(2981), }, ], }, @@ -88139,7 +88187,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4566, 4572), }); declarations.push(Declaration { - id: DeclarationId(2982), + id: DeclarationId(2983), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88158,7 +88206,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(2983), + id: DeclarationId(2984), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88172,17 +88220,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(2984), + id: DeclarationId(2985), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2982), + ty: DeclarationId(2983), }, Field { label: "None".to_string(), - ty: DeclarationId(2983), + ty: DeclarationId(2984), }, ], }, @@ -88197,7 +88245,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_messages.dag", 4589, 4596), }); declarations.push(Declaration { - id: DeclarationId(2985), + id: DeclarationId(2986), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88216,7 +88264,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), }); declarations.push(Declaration { - id: DeclarationId(2986), + id: DeclarationId(2987), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88230,17 +88278,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), }); declarations.push(Declaration { - id: DeclarationId(2987), + id: DeclarationId(2988), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2985), + ty: DeclarationId(2986), }, Field { label: "None".to_string(), - ty: DeclarationId(2986), + ty: DeclarationId(2987), }, ], }, @@ -88255,7 +88303,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4009, 4036), }); declarations.push(Declaration { - id: DeclarationId(2988), + id: DeclarationId(2989), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88274,7 +88322,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), }); declarations.push(Declaration { - id: DeclarationId(2989), + id: DeclarationId(2990), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88288,17 +88336,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), }); declarations.push(Declaration { - id: DeclarationId(2990), + id: DeclarationId(2991), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2988), + ty: DeclarationId(2989), }, Field { label: "None".to_string(), - ty: DeclarationId(2989), + ty: DeclarationId(2990), }, ], }, @@ -88313,7 +88361,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 4053, 4058), }); declarations.push(Declaration { - id: DeclarationId(2991), + id: DeclarationId(2992), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88332,7 +88380,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), }); declarations.push(Declaration { - id: DeclarationId(2992), + id: DeclarationId(2993), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88346,17 +88394,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), }); declarations.push(Declaration { - id: DeclarationId(2993), + id: DeclarationId(2994), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2991), + ty: DeclarationId(2992), }, Field { label: "None".to_string(), - ty: DeclarationId(2992), + ty: DeclarationId(2993), }, ], }, @@ -88371,7 +88419,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5414, 5421), }); declarations.push(Declaration { - id: DeclarationId(2994), + id: DeclarationId(2995), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88390,7 +88438,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), }); declarations.push(Declaration { - id: DeclarationId(2995), + id: DeclarationId(2996), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88404,17 +88452,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), }); declarations.push(Declaration { - id: DeclarationId(2996), + id: DeclarationId(2997), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2994), + ty: DeclarationId(2995), }, Field { label: "None".to_string(), - ty: DeclarationId(2995), + ty: DeclarationId(2996), }, ], }, @@ -88429,7 +88477,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5432, 5439), }); declarations.push(Declaration { - id: DeclarationId(2997), + id: DeclarationId(2998), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88448,7 +88496,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), }); declarations.push(Declaration { - id: DeclarationId(2998), + id: DeclarationId(2999), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88462,17 +88510,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), }); declarations.push(Declaration { - id: DeclarationId(2999), + id: DeclarationId(3000), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(2997), + ty: DeclarationId(2998), }, Field { label: "None".to_string(), - ty: DeclarationId(2998), + ty: DeclarationId(2999), }, ], }, @@ -88487,7 +88535,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5562, 5569), }); declarations.push(Declaration { - id: DeclarationId(3000), + id: DeclarationId(3001), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88506,7 +88554,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), }); declarations.push(Declaration { - id: DeclarationId(3001), + id: DeclarationId(3002), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88520,17 +88568,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), }); declarations.push(Declaration { - id: DeclarationId(3002), + id: DeclarationId(3003), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3000), + ty: DeclarationId(3001), }, Field { label: "None".to_string(), - ty: DeclarationId(3001), + ty: DeclarationId(3002), }, ], }, @@ -88545,7 +88593,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5580, 5587), }); declarations.push(Declaration { - id: DeclarationId(3003), + id: DeclarationId(3004), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88564,7 +88612,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), }); declarations.push(Declaration { - id: DeclarationId(3004), + id: DeclarationId(3005), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88578,17 +88626,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), }); declarations.push(Declaration { - id: DeclarationId(3005), + id: DeclarationId(3006), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3003), + ty: DeclarationId(3004), }, Field { label: "None".to_string(), - ty: DeclarationId(3004), + ty: DeclarationId(3005), }, ], }, @@ -88603,7 +88651,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5720, 5727), }); declarations.push(Declaration { - id: DeclarationId(3006), + id: DeclarationId(3007), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88622,7 +88670,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), }); declarations.push(Declaration { - id: DeclarationId(3007), + id: DeclarationId(3008), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88636,17 +88684,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), }); declarations.push(Declaration { - id: DeclarationId(3008), + id: DeclarationId(3009), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3006), + ty: DeclarationId(3007), }, Field { label: "None".to_string(), - ty: DeclarationId(3007), + ty: DeclarationId(3008), }, ], }, @@ -88661,7 +88709,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5738, 5745), }); declarations.push(Declaration { - id: DeclarationId(3009), + id: DeclarationId(3010), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88680,7 +88728,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), }); declarations.push(Declaration { - id: DeclarationId(3010), + id: DeclarationId(3011), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88694,17 +88742,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), }); declarations.push(Declaration { - id: DeclarationId(3011), + id: DeclarationId(3012), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3009), + ty: DeclarationId(3010), }, Field { label: "None".to_string(), - ty: DeclarationId(3010), + ty: DeclarationId(3011), }, ], }, @@ -88719,7 +88767,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5876, 5883), }); declarations.push(Declaration { - id: DeclarationId(3012), + id: DeclarationId(3013), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88738,7 +88786,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), }); declarations.push(Declaration { - id: DeclarationId(3013), + id: DeclarationId(3014), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88752,17 +88800,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), }); declarations.push(Declaration { - id: DeclarationId(3014), + id: DeclarationId(3015), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3012), + ty: DeclarationId(3013), }, Field { label: "None".to_string(), - ty: DeclarationId(3013), + ty: DeclarationId(3014), }, ], }, @@ -88777,7 +88825,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 5969, 5976), }); declarations.push(Declaration { - id: DeclarationId(3015), + id: DeclarationId(3016), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88796,7 +88844,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), }); declarations.push(Declaration { - id: DeclarationId(3016), + id: DeclarationId(3017), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88810,17 +88858,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), }); declarations.push(Declaration { - id: DeclarationId(3017), + id: DeclarationId(3018), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3015), + ty: DeclarationId(3016), }, Field { label: "None".to_string(), - ty: DeclarationId(3016), + ty: DeclarationId(3017), }, ], }, @@ -88835,7 +88883,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6674, 6709), }); declarations.push(Declaration { - id: DeclarationId(3018), + id: DeclarationId(3019), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88854,7 +88902,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), }); declarations.push(Declaration { - id: DeclarationId(3019), + id: DeclarationId(3020), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88868,17 +88916,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), }); declarations.push(Declaration { - id: DeclarationId(3020), + id: DeclarationId(3021), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3018), + ty: DeclarationId(3019), }, Field { label: "None".to_string(), - ty: DeclarationId(3019), + ty: DeclarationId(3020), }, ], }, @@ -88893,7 +88941,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 6912, 6917), }); declarations.push(Declaration { - id: DeclarationId(3021), + id: DeclarationId(3022), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88912,7 +88960,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), }); declarations.push(Declaration { - id: DeclarationId(3022), + id: DeclarationId(3023), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88926,17 +88974,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), }); declarations.push(Declaration { - id: DeclarationId(3023), + id: DeclarationId(3024), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3021), + ty: DeclarationId(3022), }, Field { label: "None".to_string(), - ty: DeclarationId(3022), + ty: DeclarationId(3023), }, ], }, @@ -88951,7 +88999,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7017, 7022), }); declarations.push(Declaration { - id: DeclarationId(3024), + id: DeclarationId(3025), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -88970,7 +89018,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), }); declarations.push(Declaration { - id: DeclarationId(3025), + id: DeclarationId(3026), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -88984,17 +89032,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), }); declarations.push(Declaration { - id: DeclarationId(3026), + id: DeclarationId(3027), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3024), + ty: DeclarationId(3025), }, Field { label: "None".to_string(), - ty: DeclarationId(3025), + ty: DeclarationId(3026), }, ], }, @@ -89009,7 +89057,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7108, 7113), }); declarations.push(Declaration { - id: DeclarationId(3027), + id: DeclarationId(3028), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89028,7 +89076,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), }); declarations.push(Declaration { - id: DeclarationId(3028), + id: DeclarationId(3029), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89042,17 +89090,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), }); declarations.push(Declaration { - id: DeclarationId(3029), + id: DeclarationId(3030), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3027), + ty: DeclarationId(3028), }, Field { label: "None".to_string(), - ty: DeclarationId(3028), + ty: DeclarationId(3029), }, ], }, @@ -89067,7 +89115,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7735, 7739), }); declarations.push(Declaration { - id: DeclarationId(3030), + id: DeclarationId(3031), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89086,7 +89134,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { - id: DeclarationId(3031), + id: DeclarationId(3032), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89100,17 +89148,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { - id: DeclarationId(3032), + id: DeclarationId(3033), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3030), + ty: DeclarationId(3031), }, Field { label: "None".to_string(), - ty: DeclarationId(3031), + ty: DeclarationId(3032), }, ], }, @@ -89125,7 +89173,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7771, 7775), }); declarations.push(Declaration { - id: DeclarationId(3033), + id: DeclarationId(3034), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89144,7 +89192,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), }); declarations.push(Declaration { - id: DeclarationId(3034), + id: DeclarationId(3035), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89158,17 +89206,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), }); declarations.push(Declaration { - id: DeclarationId(3035), + id: DeclarationId(3036), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3033), + ty: DeclarationId(3034), }, Field { label: "None".to_string(), - ty: DeclarationId(3034), + ty: DeclarationId(3035), }, ], }, @@ -89183,7 +89231,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 7807, 7814), }); declarations.push(Declaration { - id: DeclarationId(3036), + id: DeclarationId(3037), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89202,7 +89250,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8805, 8812), }); declarations.push(Declaration { - id: DeclarationId(3037), + id: DeclarationId(3038), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89216,17 +89264,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8805, 8812), }); declarations.push(Declaration { - id: DeclarationId(3038), + id: DeclarationId(3039), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3036), + ty: DeclarationId(3037), }, Field { label: "None".to_string(), - ty: DeclarationId(3037), + ty: DeclarationId(3038), }, ], }, @@ -89241,7 +89289,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8805, 8812), }); declarations.push(Declaration { - id: DeclarationId(3039), + id: DeclarationId(3040), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89260,7 +89308,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8873, 8878), }); declarations.push(Declaration { - id: DeclarationId(3040), + id: DeclarationId(3041), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89274,17 +89322,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8873, 8878), }); declarations.push(Declaration { - id: DeclarationId(3041), + id: DeclarationId(3042), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3039), + ty: DeclarationId(3040), }, Field { label: "None".to_string(), - ty: DeclarationId(3040), + ty: DeclarationId(3041), }, ], }, @@ -89299,7 +89347,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/anthropic_schema.dag", 8873, 8878), }); declarations.push(Declaration { - id: DeclarationId(3042), + id: DeclarationId(3043), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89318,7 +89366,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3043), + id: DeclarationId(3044), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89332,17 +89380,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3044), + id: DeclarationId(3045), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3042), + ty: DeclarationId(3043), }, Field { label: "None".to_string(), - ty: DeclarationId(3043), + ty: DeclarationId(3044), }, ], }, @@ -89357,7 +89405,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 2743, 2755), }); declarations.push(Declaration { - id: DeclarationId(3045), + id: DeclarationId(3046), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89376,7 +89424,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3046), + id: DeclarationId(3047), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89390,17 +89438,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3047), + id: DeclarationId(3048), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3045), + ty: DeclarationId(3046), }, Field { label: "None".to_string(), - ty: DeclarationId(3046), + ty: DeclarationId(3047), }, ], }, @@ -89415,7 +89463,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 5556, 5563), }); declarations.push(Declaration { - id: DeclarationId(3048), + id: DeclarationId(3049), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89434,7 +89482,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3049), + id: DeclarationId(3050), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89448,17 +89496,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3050), + id: DeclarationId(3051), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3048), + ty: DeclarationId(3049), }, Field { label: "None".to_string(), - ty: DeclarationId(3049), + ty: DeclarationId(3050), }, ], }, @@ -89473,7 +89521,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 6487, 6491), }); declarations.push(Declaration { - id: DeclarationId(3051), + id: DeclarationId(3052), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89492,7 +89540,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(3052), + id: DeclarationId(3053), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89506,17 +89554,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(3053), + id: DeclarationId(3054), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3051), + ty: DeclarationId(3052), }, Field { label: "None".to_string(), - ty: DeclarationId(3052), + ty: DeclarationId(3053), }, ], }, @@ -89531,7 +89579,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 7538, 7557), }); declarations.push(Declaration { - id: DeclarationId(3054), + id: DeclarationId(3055), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89550,7 +89598,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3055), + id: DeclarationId(3056), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89564,17 +89612,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3056), + id: DeclarationId(3057), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3054), + ty: DeclarationId(3055), }, Field { label: "None".to_string(), - ty: DeclarationId(3055), + ty: DeclarationId(3056), }, ], }, @@ -89589,7 +89637,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 8103, 8122), }); declarations.push(Declaration { - id: DeclarationId(3057), + id: DeclarationId(3058), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89608,7 +89656,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3058), + id: DeclarationId(3059), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89622,17 +89670,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3059), + id: DeclarationId(3060), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3057), + ty: DeclarationId(3058), }, Field { label: "None".to_string(), - ty: DeclarationId(3058), + ty: DeclarationId(3059), }, ], }, @@ -89647,7 +89695,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/computation.dag", 3636, 3649), }); declarations.push(Declaration { - id: DeclarationId(3060), + id: DeclarationId(3061), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89666,7 +89714,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3061), + id: DeclarationId(3062), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89680,17 +89728,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3062), + id: DeclarationId(3063), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3060), + ty: DeclarationId(3061), }, Field { label: "None".to_string(), - ty: DeclarationId(3061), + ty: DeclarationId(3062), }, ], }, @@ -89705,7 +89753,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 20558, 20570), }); declarations.push(Declaration { - id: DeclarationId(3063), + id: DeclarationId(3064), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89724,7 +89772,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3064), + id: DeclarationId(3065), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89738,17 +89786,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3065), + id: DeclarationId(3066), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3063), + ty: DeclarationId(3064), }, Field { label: "None".to_string(), - ty: DeclarationId(3064), + ty: DeclarationId(3065), }, ], }, @@ -89763,7 +89811,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 21943, 21958), }); declarations.push(Declaration { - id: DeclarationId(3066), + id: DeclarationId(3067), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89782,7 +89830,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3067), + id: DeclarationId(3068), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89796,17 +89844,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3068), + id: DeclarationId(3069), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3066), + ty: DeclarationId(3067), }, Field { label: "None".to_string(), - ty: DeclarationId(3067), + ty: DeclarationId(3068), }, ], }, @@ -89821,7 +89869,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33612, 33616), }); declarations.push(Declaration { - id: DeclarationId(3069), + id: DeclarationId(3070), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89840,7 +89888,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3070), + id: DeclarationId(3071), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89854,17 +89902,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3071), + id: DeclarationId(3072), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3069), + ty: DeclarationId(3070), }, Field { label: "None".to_string(), - ty: DeclarationId(3070), + ty: DeclarationId(3071), }, ], }, @@ -89879,7 +89927,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 33908, 33912), }); declarations.push(Declaration { - id: DeclarationId(3072), + id: DeclarationId(3073), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89898,7 +89946,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3073), + id: DeclarationId(3074), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89912,17 +89960,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3074), + id: DeclarationId(3075), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3072), + ty: DeclarationId(3073), }, Field { label: "None".to_string(), - ty: DeclarationId(3073), + ty: DeclarationId(3074), }, ], }, @@ -89937,7 +89985,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35157, 35161), }); declarations.push(Declaration { - id: DeclarationId(3075), + id: DeclarationId(3076), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -89956,7 +90004,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3076), + id: DeclarationId(3077), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -89970,17 +90018,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3077), + id: DeclarationId(3078), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3075), + ty: DeclarationId(3076), }, Field { label: "None".to_string(), - ty: DeclarationId(3076), + ty: DeclarationId(3077), }, ], }, @@ -89995,7 +90043,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 35632, 35636), }); declarations.push(Declaration { - id: DeclarationId(3078), + id: DeclarationId(3079), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90014,7 +90062,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3079), + id: DeclarationId(3080), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90028,17 +90076,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3080), + id: DeclarationId(3081), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3078), + ty: DeclarationId(3079), }, Field { label: "None".to_string(), - ty: DeclarationId(3079), + ty: DeclarationId(3080), }, ], }, @@ -90053,7 +90101,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 36895, 36899), }); declarations.push(Declaration { - id: DeclarationId(3081), + id: DeclarationId(3082), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90072,7 +90120,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3082), + id: DeclarationId(3083), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90086,17 +90134,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3083), + id: DeclarationId(3084), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3081), + ty: DeclarationId(3082), }, Field { label: "None".to_string(), - ty: DeclarationId(3082), + ty: DeclarationId(3083), }, ], }, @@ -90111,7 +90159,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/induction.dag", 37167, 37171), }); declarations.push(Declaration { - id: DeclarationId(3084), + id: DeclarationId(3085), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90130,7 +90178,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3085), + id: DeclarationId(3086), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90144,17 +90192,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3086), + id: DeclarationId(3087), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3084), + ty: DeclarationId(3085), }, Field { label: "None".to_string(), - ty: DeclarationId(3085), + ty: DeclarationId(3086), }, ], }, @@ -90169,7 +90217,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 1267, 1279), }); declarations.push(Declaration { - id: DeclarationId(3087), + id: DeclarationId(3088), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90188,7 +90236,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3088), + id: DeclarationId(3089), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90202,17 +90250,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3089), + id: DeclarationId(3090), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3087), + ty: DeclarationId(3088), }, Field { label: "None".to_string(), - ty: DeclarationId(3088), + ty: DeclarationId(3089), }, ], }, @@ -90227,7 +90275,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 9551, 9563), }); declarations.push(Declaration { - id: DeclarationId(3090), + id: DeclarationId(3091), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90246,7 +90294,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3091), + id: DeclarationId(3092), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90260,17 +90308,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3092), + id: DeclarationId(3093), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3090), + ty: DeclarationId(3091), }, Field { label: "None".to_string(), - ty: DeclarationId(3091), + ty: DeclarationId(3092), }, ], }, @@ -90285,7 +90333,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10028, 10040), }); declarations.push(Declaration { - id: DeclarationId(3093), + id: DeclarationId(3094), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90304,7 +90352,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3094), + id: DeclarationId(3095), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90318,17 +90366,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3095), + id: DeclarationId(3096), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3093), + ty: DeclarationId(3094), }, Field { label: "None".to_string(), - ty: DeclarationId(3094), + ty: DeclarationId(3095), }, ], }, @@ -90343,7 +90391,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10586, 10598), }); declarations.push(Declaration { - id: DeclarationId(3096), + id: DeclarationId(3097), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90362,7 +90410,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3097), + id: DeclarationId(3098), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90376,17 +90424,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3098), + id: DeclarationId(3099), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3096), + ty: DeclarationId(3097), }, Field { label: "None".to_string(), - ty: DeclarationId(3097), + ty: DeclarationId(3098), }, ], }, @@ -90401,7 +90449,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/parse_surface.dag", 10766, 10778), }); declarations.push(Declaration { - id: DeclarationId(3099), + id: DeclarationId(3100), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90420,7 +90468,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3100), + id: DeclarationId(3101), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90434,17 +90482,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3101), + id: DeclarationId(3102), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3099), + ty: DeclarationId(3100), }, Field { label: "None".to_string(), - ty: DeclarationId(3100), + ty: DeclarationId(3101), }, ], }, @@ -90459,7 +90507,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2429, 2445), }); declarations.push(Declaration { - id: DeclarationId(3102), + id: DeclarationId(3103), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90478,7 +90526,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3103), + id: DeclarationId(3104), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90492,17 +90540,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3104), + id: DeclarationId(3105), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3102), + ty: DeclarationId(3103), }, Field { label: "None".to_string(), - ty: DeclarationId(3103), + ty: DeclarationId(3104), }, ], }, @@ -90517,7 +90565,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2450, 2466), }); declarations.push(Declaration { - id: DeclarationId(3105), + id: DeclarationId(3106), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90536,7 +90584,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3106), + id: DeclarationId(3107), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90550,17 +90598,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3107), + id: DeclarationId(3108), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3105), + ty: DeclarationId(3106), }, Field { label: "None".to_string(), - ty: DeclarationId(3106), + ty: DeclarationId(3107), }, ], }, @@ -90575,7 +90623,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 2471, 2487), }); declarations.push(Declaration { - id: DeclarationId(3108), + id: DeclarationId(3109), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90594,7 +90642,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3109), + id: DeclarationId(3110), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90608,17 +90656,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3110), + id: DeclarationId(3111), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3108), + ty: DeclarationId(3109), }, Field { label: "None".to_string(), - ty: DeclarationId(3109), + ty: DeclarationId(3110), }, ], }, @@ -90633,7 +90681,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6397, 6419), }); declarations.push(Declaration { - id: DeclarationId(3111), + id: DeclarationId(3112), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90652,7 +90700,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3112), + id: DeclarationId(3113), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90666,17 +90714,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3113), + id: DeclarationId(3114), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3111), + ty: DeclarationId(3112), }, Field { label: "None".to_string(), - ty: DeclarationId(3112), + ty: DeclarationId(3113), }, ], }, @@ -90691,7 +90739,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/std/termination.dag", 6839, 6859), }); declarations.push(Declaration { - id: DeclarationId(3114), + id: DeclarationId(3115), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90710,7 +90758,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3115), + id: DeclarationId(3116), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90724,17 +90772,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3116), + id: DeclarationId(3117), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3114), + ty: DeclarationId(3115), }, Field { label: "None".to_string(), - ty: DeclarationId(3115), + ty: DeclarationId(3116), }, ], }, @@ -90749,7 +90797,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("src/v3/compiler/operators.dag", 142, 155), }); declarations.push(Declaration { - id: DeclarationId(3117), + id: DeclarationId(3118), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90768,7 +90816,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3118), + id: DeclarationId(3119), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90782,17 +90830,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3119), + id: DeclarationId(3120), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3117), + ty: DeclarationId(3118), }, Field { label: "None".to_string(), - ty: DeclarationId(3118), + ty: DeclarationId(3119), }, ], }, @@ -90807,7 +90855,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1274, 1284), }); declarations.push(Declaration { - id: DeclarationId(3120), + id: DeclarationId(3121), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90826,7 +90874,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3121), + id: DeclarationId(3122), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90840,17 +90888,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3122), + id: DeclarationId(3123), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3120), + ty: DeclarationId(3121), }, Field { label: "None".to_string(), - ty: DeclarationId(3121), + ty: DeclarationId(3122), }, ], }, @@ -90865,7 +90913,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/github.dag", 1554, 1561), }); declarations.push(Declaration { - id: DeclarationId(3123), + id: DeclarationId(3124), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90884,7 +90932,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3124), + id: DeclarationId(3125), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90898,17 +90946,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3125), + id: DeclarationId(3126), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3123), + ty: DeclarationId(3124), }, Field { label: "None".to_string(), - ty: DeclarationId(3124), + ty: DeclarationId(3125), }, ], }, @@ -90923,7 +90971,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 911, 931), }); declarations.push(Declaration { - id: DeclarationId(3126), + id: DeclarationId(3127), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -90942,7 +90990,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3127), + id: DeclarationId(3128), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -90956,17 +91004,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3128), + id: DeclarationId(3129), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3126), + ty: DeclarationId(3127), }, Field { label: "None".to_string(), - ty: DeclarationId(3127), + ty: DeclarationId(3128), }, ], }, @@ -90981,7 +91029,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1671, 1678), }); declarations.push(Declaration { - id: DeclarationId(3129), + id: DeclarationId(3130), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91000,7 +91048,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3130), + id: DeclarationId(3131), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91014,17 +91062,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3131), + id: DeclarationId(3132), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3129), + ty: DeclarationId(3130), }, Field { label: "None".to_string(), - ty: DeclarationId(3130), + ty: DeclarationId(3131), }, ], }, @@ -91039,7 +91087,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 1707, 1714), }); declarations.push(Declaration { - id: DeclarationId(3132), + id: DeclarationId(3133), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91058,7 +91106,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3133), + id: DeclarationId(3134), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91072,17 +91120,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3134), + id: DeclarationId(3135), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3132), + ty: DeclarationId(3133), }, Field { label: "None".to_string(), - ty: DeclarationId(3133), + ty: DeclarationId(3134), }, ], }, @@ -91097,7 +91145,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4354, 4361), }); declarations.push(Declaration { - id: DeclarationId(3135), + id: DeclarationId(3136), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91116,7 +91164,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3136), + id: DeclarationId(3137), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91130,17 +91178,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3137), + id: DeclarationId(3138), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3135), + ty: DeclarationId(3136), }, Field { label: "None".to_string(), - ty: DeclarationId(3136), + ty: DeclarationId(3137), }, ], }, @@ -91155,7 +91203,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4468, 4475), }); declarations.push(Declaration { - id: DeclarationId(3138), + id: DeclarationId(3139), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91174,7 +91222,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3139), + id: DeclarationId(3140), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91188,17 +91236,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3140), + id: DeclarationId(3141), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3138), + ty: DeclarationId(3139), }, Field { label: "None".to_string(), - ty: DeclarationId(3139), + ty: DeclarationId(3140), }, ], }, @@ -91213,7 +91261,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4488, 4503), }); declarations.push(Declaration { - id: DeclarationId(3141), + id: DeclarationId(3142), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91232,7 +91280,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3142), + id: DeclarationId(3143), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91246,17 +91294,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3143), + id: DeclarationId(3144), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3141), + ty: DeclarationId(3142), }, Field { label: "None".to_string(), - ty: DeclarationId(3142), + ty: DeclarationId(3143), }, ], }, @@ -91271,7 +91319,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4523, 4527), }); declarations.push(Declaration { - id: DeclarationId(3144), + id: DeclarationId(3145), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91290,7 +91338,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3145), + id: DeclarationId(3146), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91304,17 +91352,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3146), + id: DeclarationId(3147), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3144), + ty: DeclarationId(3145), }, Field { label: "None".to_string(), - ty: DeclarationId(3145), + ty: DeclarationId(3146), }, ], }, @@ -91329,7 +91377,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 4569, 4585), }); declarations.push(Declaration { - id: DeclarationId(3147), + id: DeclarationId(3148), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91348,7 +91396,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3148), + id: DeclarationId(3149), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91362,17 +91410,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3149), + id: DeclarationId(3150), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3147), + ty: DeclarationId(3148), }, Field { label: "None".to_string(), - ty: DeclarationId(3148), + ty: DeclarationId(3149), }, ], }, @@ -91387,7 +91435,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5159, 5166), }); declarations.push(Declaration { - id: DeclarationId(3150), + id: DeclarationId(3151), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91406,7 +91454,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3151), + id: DeclarationId(3152), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91420,17 +91468,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3152), + id: DeclarationId(3153), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3150), + ty: DeclarationId(3151), }, Field { label: "None".to_string(), - ty: DeclarationId(3151), + ty: DeclarationId(3152), }, ], }, @@ -91445,7 +91493,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5268, 5275), }); declarations.push(Declaration { - id: DeclarationId(3153), + id: DeclarationId(3154), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91464,7 +91512,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3154), + id: DeclarationId(3155), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91478,17 +91526,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3155), + id: DeclarationId(3156), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3153), + ty: DeclarationId(3154), }, Field { label: "None".to_string(), - ty: DeclarationId(3154), + ty: DeclarationId(3155), }, ], }, @@ -91503,7 +91551,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5297, 5304), }); declarations.push(Declaration { - id: DeclarationId(3156), + id: DeclarationId(3157), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91522,7 +91570,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3157), + id: DeclarationId(3158), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91536,17 +91584,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3158), + id: DeclarationId(3159), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3156), + ty: DeclarationId(3157), }, Field { label: "None".to_string(), - ty: DeclarationId(3157), + ty: DeclarationId(3158), }, ], }, @@ -91561,7 +91609,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5360, 5364), }); declarations.push(Declaration { - id: DeclarationId(3159), + id: DeclarationId(3160), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91580,7 +91628,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3160), + id: DeclarationId(3161), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91594,17 +91642,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3161), + id: DeclarationId(3162), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3159), + ty: DeclarationId(3160), }, Field { label: "None".to_string(), - ty: DeclarationId(3160), + ty: DeclarationId(3161), }, ], }, @@ -91619,7 +91667,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5398, 5405), }); declarations.push(Declaration { - id: DeclarationId(3162), + id: DeclarationId(3163), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91638,7 +91686,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3163), + id: DeclarationId(3164), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91652,17 +91700,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3164), + id: DeclarationId(3165), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3162), + ty: DeclarationId(3163), }, Field { label: "None".to_string(), - ty: DeclarationId(3163), + ty: DeclarationId(3164), }, ], }, @@ -91677,7 +91725,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5515, 5522), }); declarations.push(Declaration { - id: DeclarationId(3165), + id: DeclarationId(3166), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91696,7 +91744,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3166), + id: DeclarationId(3167), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91710,17 +91758,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3167), + id: DeclarationId(3168), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3165), + ty: DeclarationId(3166), }, Field { label: "None".to_string(), - ty: DeclarationId(3166), + ty: DeclarationId(3167), }, ], }, @@ -91735,7 +91783,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 5578, 5582), }); declarations.push(Declaration { - id: DeclarationId(3168), + id: DeclarationId(3169), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91754,7 +91802,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3169), + id: DeclarationId(3170), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91768,17 +91816,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3170), + id: DeclarationId(3171), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3168), + ty: DeclarationId(3169), }, Field { label: "None".to_string(), - ty: DeclarationId(3169), + ty: DeclarationId(3170), }, ], }, @@ -91793,7 +91841,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6001, 6008), }); declarations.push(Declaration { - id: DeclarationId(3171), + id: DeclarationId(3172), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91812,7 +91860,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3172), + id: DeclarationId(3173), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91826,17 +91874,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3173), + id: DeclarationId(3174), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3171), + ty: DeclarationId(3172), }, Field { label: "None".to_string(), - ty: DeclarationId(3172), + ty: DeclarationId(3173), }, ], }, @@ -91851,7 +91899,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6016, 6020), }); declarations.push(Declaration { - id: DeclarationId(3174), + id: DeclarationId(3175), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91870,7 +91918,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3175), + id: DeclarationId(3176), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91884,17 +91932,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3176), + id: DeclarationId(3177), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3174), + ty: DeclarationId(3175), }, Field { label: "None".to_string(), - ty: DeclarationId(3175), + ty: DeclarationId(3176), }, ], }, @@ -91909,7 +91957,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6027, 6031), }); declarations.push(Declaration { - id: DeclarationId(3177), + id: DeclarationId(3178), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91928,7 +91976,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3178), + id: DeclarationId(3179), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -91942,17 +91990,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3179), + id: DeclarationId(3180), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3177), + ty: DeclarationId(3178), }, Field { label: "None".to_string(), - ty: DeclarationId(3178), + ty: DeclarationId(3179), }, ], }, @@ -91967,7 +92015,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6081, 6088), }); declarations.push(Declaration { - id: DeclarationId(3180), + id: DeclarationId(3181), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -91986,7 +92034,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3181), + id: DeclarationId(3182), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92000,17 +92048,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3182), + id: DeclarationId(3183), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3180), + ty: DeclarationId(3181), }, Field { label: "None".to_string(), - ty: DeclarationId(3181), + ty: DeclarationId(3182), }, ], }, @@ -92025,7 +92073,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6096, 6100), }); declarations.push(Declaration { - id: DeclarationId(3183), + id: DeclarationId(3184), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92044,7 +92092,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3184), + id: DeclarationId(3185), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92058,17 +92106,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3185), + id: DeclarationId(3186), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3183), + ty: DeclarationId(3184), }, Field { label: "None".to_string(), - ty: DeclarationId(3184), + ty: DeclarationId(3185), }, ], }, @@ -92083,7 +92131,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6107, 6111), }); declarations.push(Declaration { - id: DeclarationId(3186), + id: DeclarationId(3187), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92102,7 +92150,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3187), + id: DeclarationId(3188), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92116,17 +92164,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3188), + id: DeclarationId(3189), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3186), + ty: DeclarationId(3187), }, Field { label: "None".to_string(), - ty: DeclarationId(3187), + ty: DeclarationId(3188), }, ], }, @@ -92141,7 +92189,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6160, 6167), }); declarations.push(Declaration { - id: DeclarationId(3189), + id: DeclarationId(3190), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92160,7 +92208,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3190), + id: DeclarationId(3191), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92174,17 +92222,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3191), + id: DeclarationId(3192), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3189), + ty: DeclarationId(3190), }, Field { label: "None".to_string(), - ty: DeclarationId(3190), + ty: DeclarationId(3191), }, ], }, @@ -92199,7 +92247,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6175, 6179), }); declarations.push(Declaration { - id: DeclarationId(3192), + id: DeclarationId(3193), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92218,7 +92266,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3193), + id: DeclarationId(3194), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92232,17 +92280,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3194), + id: DeclarationId(3195), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3192), + ty: DeclarationId(3193), }, Field { label: "None".to_string(), - ty: DeclarationId(3193), + ty: DeclarationId(3194), }, ], }, @@ -92257,7 +92305,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 6186, 6190), }); declarations.push(Declaration { - id: DeclarationId(3195), + id: DeclarationId(3196), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92276,7 +92324,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3196), + id: DeclarationId(3197), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92290,17 +92338,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3197), + id: DeclarationId(3198), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3195), + ty: DeclarationId(3196), }, Field { label: "None".to_string(), - ty: DeclarationId(3196), + ty: DeclarationId(3197), }, ], }, @@ -92315,7 +92363,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7170, 7174), }); declarations.push(Declaration { - id: DeclarationId(3198), + id: DeclarationId(3199), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92334,7 +92382,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(3199), + id: DeclarationId(3200), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92348,17 +92396,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(3200), + id: DeclarationId(3201), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3198), + ty: DeclarationId(3199), }, Field { label: "None".to_string(), - ty: DeclarationId(3199), + ty: DeclarationId(3200), }, ], }, @@ -92373,7 +92421,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7253, 7260), }); declarations.push(Declaration { - id: DeclarationId(3201), + id: DeclarationId(3202), name: None, connective: TypeConnective::Conj { children: vec![Field { @@ -92392,7 +92440,7 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { - id: DeclarationId(3202), + id: DeclarationId(3203), name: None, connective: TypeConnective::Conj { children: vec![] }, type_params: vec![], @@ -92406,17 +92454,17 @@ fn bootstrapped_fixture_dag_declarations() -> Vec { span: SourceSpan::new("dsl/extdeps/github/actions.dag", 7900, 7904), }); declarations.push(Declaration { - id: DeclarationId(3203), + id: DeclarationId(3204), name: None, connective: TypeConnective::Disj { variants: vec![ Field { label: "Some".to_string(), - ty: DeclarationId(3201), + ty: DeclarationId(3202), }, Field { label: "None".to_string(), - ty: DeclarationId(3202), + ty: DeclarationId(3203), }, ], }, @@ -100524,130 +100572,130 @@ fn bootstrapped_fixture_dag_clusters() -> Vec { fn bootstrapped_fixture_dag_optional_match_disjs() -> HashMap { { let mut map = HashMap::new(); - map.insert(DeclarationId(389), DeclarationId(2834)); - map.insert(DeclarationId(391), DeclarationId(2837)); - map.insert(DeclarationId(423), DeclarationId(2840)); - map.insert(DeclarationId(426), DeclarationId(2843)); - map.insert(DeclarationId(471), DeclarationId(2846)); - map.insert(DeclarationId(472), DeclarationId(2849)); - map.insert(DeclarationId(473), DeclarationId(2852)); - map.insert(DeclarationId(513), DeclarationId(2855)); - map.insert(DeclarationId(515), DeclarationId(2858)); - map.insert(DeclarationId(516), DeclarationId(2861)); - map.insert(DeclarationId(539), DeclarationId(2864)); - map.insert(DeclarationId(582), DeclarationId(2867)); - map.insert(DeclarationId(602), DeclarationId(2870)); - map.insert(DeclarationId(603), DeclarationId(2873)); - map.insert(DeclarationId(605), DeclarationId(2876)); - map.insert(DeclarationId(608), DeclarationId(2879)); - map.insert(DeclarationId(613), DeclarationId(2882)); - map.insert(DeclarationId(614), DeclarationId(2885)); - map.insert(DeclarationId(618), DeclarationId(2888)); - map.insert(DeclarationId(619), DeclarationId(2891)); - map.insert(DeclarationId(620), DeclarationId(2894)); - map.insert(DeclarationId(625), DeclarationId(2897)); - map.insert(DeclarationId(1778), DeclarationId(2900)); - map.insert(DeclarationId(1782), DeclarationId(2903)); - map.insert(DeclarationId(1785), DeclarationId(2906)); - map.insert(DeclarationId(1787), DeclarationId(2909)); - map.insert(DeclarationId(1788), DeclarationId(2912)); - map.insert(DeclarationId(1789), DeclarationId(2915)); - map.insert(DeclarationId(1843), DeclarationId(2918)); - map.insert(DeclarationId(1844), DeclarationId(2921)); - map.insert(DeclarationId(1845), DeclarationId(2924)); - map.insert(DeclarationId(1846), DeclarationId(2927)); - map.insert(DeclarationId(1847), DeclarationId(2930)); - map.insert(DeclarationId(1848), DeclarationId(2933)); - map.insert(DeclarationId(1854), DeclarationId(2936)); - map.insert(DeclarationId(1909), DeclarationId(2939)); - map.insert(DeclarationId(1912), DeclarationId(2942)); - map.insert(DeclarationId(1913), DeclarationId(2945)); - map.insert(DeclarationId(1914), DeclarationId(2948)); - map.insert(DeclarationId(1915), DeclarationId(2951)); - map.insert(DeclarationId(1938), DeclarationId(2954)); - map.insert(DeclarationId(1943), DeclarationId(2957)); - map.insert(DeclarationId(1947), DeclarationId(2960)); - map.insert(DeclarationId(1950), DeclarationId(2963)); - map.insert(DeclarationId(1951), DeclarationId(2966)); - map.insert(DeclarationId(1996), DeclarationId(2969)); - map.insert(DeclarationId(1997), DeclarationId(2972)); - map.insert(DeclarationId(1998), DeclarationId(2975)); - map.insert(DeclarationId(1999), DeclarationId(2978)); - map.insert(DeclarationId(2049), DeclarationId(2981)); - map.insert(DeclarationId(2050), DeclarationId(2984)); - map.insert(DeclarationId(2064), DeclarationId(2987)); - map.insert(DeclarationId(2065), DeclarationId(2990)); - map.insert(DeclarationId(2076), DeclarationId(2993)); - map.insert(DeclarationId(2077), DeclarationId(2996)); - map.insert(DeclarationId(2079), DeclarationId(2999)); - map.insert(DeclarationId(2080), DeclarationId(3002)); - map.insert(DeclarationId(2082), DeclarationId(3005)); - map.insert(DeclarationId(2083), DeclarationId(3008)); - map.insert(DeclarationId(2085), DeclarationId(3011)); - map.insert(DeclarationId(2087), DeclarationId(3014)); - map.insert(DeclarationId(2090), DeclarationId(3017)); - map.insert(DeclarationId(2094), DeclarationId(3020)); - map.insert(DeclarationId(2096), DeclarationId(3023)); - map.insert(DeclarationId(2098), DeclarationId(3026)); - map.insert(DeclarationId(2108), DeclarationId(3029)); - map.insert(DeclarationId(2109), DeclarationId(3032)); - map.insert(DeclarationId(2110), DeclarationId(3035)); - map.insert(DeclarationId(2113), DeclarationId(3038)); - map.insert(DeclarationId(2114), DeclarationId(3041)); - map.insert(DeclarationId(2149), DeclarationId(3044)); - map.insert(DeclarationId(2150), DeclarationId(3047)); - map.insert(DeclarationId(2151), DeclarationId(3050)); - map.insert(DeclarationId(2152), DeclarationId(3053)); - map.insert(DeclarationId(2153), DeclarationId(3056)); - map.insert(DeclarationId(2176), DeclarationId(3059)); - map.insert(DeclarationId(2309), DeclarationId(3062)); - map.insert(DeclarationId(2310), DeclarationId(3065)); - map.insert(DeclarationId(2316), DeclarationId(3068)); - map.insert(DeclarationId(2317), DeclarationId(3071)); - map.insert(DeclarationId(2318), DeclarationId(3074)); - map.insert(DeclarationId(2319), DeclarationId(3077)); - map.insert(DeclarationId(2320), DeclarationId(3080)); - map.insert(DeclarationId(2321), DeclarationId(3083)); - map.insert(DeclarationId(2371), DeclarationId(3086)); - map.insert(DeclarationId(2415), DeclarationId(3089)); - map.insert(DeclarationId(2423), DeclarationId(3092)); - map.insert(DeclarationId(2437), DeclarationId(3095)); - map.insert(DeclarationId(2440), DeclarationId(3098)); - map.insert(DeclarationId(2498), DeclarationId(3101)); - map.insert(DeclarationId(2499), DeclarationId(3104)); - map.insert(DeclarationId(2500), DeclarationId(3107)); - map.insert(DeclarationId(2503), DeclarationId(3110)); - map.insert(DeclarationId(2504), DeclarationId(3113)); - map.insert(DeclarationId(2692), DeclarationId(3116)); - map.insert(DeclarationId(2720), DeclarationId(3119)); - map.insert(DeclarationId(2726), DeclarationId(3122)); - map.insert(DeclarationId(2733), DeclarationId(3125)); - map.insert(DeclarationId(2752), DeclarationId(3128)); - map.insert(DeclarationId(2753), DeclarationId(3131)); - map.insert(DeclarationId(2761), DeclarationId(3134)); - map.insert(DeclarationId(2765), DeclarationId(3137)); - map.insert(DeclarationId(2766), DeclarationId(3140)); - map.insert(DeclarationId(2767), DeclarationId(3143)); - map.insert(DeclarationId(2768), DeclarationId(3146)); - map.insert(DeclarationId(2778), DeclarationId(3149)); - map.insert(DeclarationId(2780), DeclarationId(3152)); - map.insert(DeclarationId(2781), DeclarationId(3155)); - map.insert(DeclarationId(2782), DeclarationId(3158)); - map.insert(DeclarationId(2784), DeclarationId(3161)); - map.insert(DeclarationId(2787), DeclarationId(3164)); - map.insert(DeclarationId(2788), DeclarationId(3167)); - map.insert(DeclarationId(2795), DeclarationId(3170)); - map.insert(DeclarationId(2796), DeclarationId(3173)); - map.insert(DeclarationId(2797), DeclarationId(3176)); - map.insert(DeclarationId(2799), DeclarationId(3179)); - map.insert(DeclarationId(2800), DeclarationId(3182)); - map.insert(DeclarationId(2801), DeclarationId(3185)); - map.insert(DeclarationId(2803), DeclarationId(3188)); - map.insert(DeclarationId(2804), DeclarationId(3191)); - map.insert(DeclarationId(2805), DeclarationId(3194)); - map.insert(DeclarationId(2812), DeclarationId(3197)); - map.insert(DeclarationId(2814), DeclarationId(3200)); - map.insert(DeclarationId(2825), DeclarationId(3203)); + map.insert(DeclarationId(389), DeclarationId(2835)); + map.insert(DeclarationId(391), DeclarationId(2838)); + map.insert(DeclarationId(423), DeclarationId(2841)); + map.insert(DeclarationId(426), DeclarationId(2844)); + map.insert(DeclarationId(471), DeclarationId(2847)); + map.insert(DeclarationId(472), DeclarationId(2850)); + map.insert(DeclarationId(473), DeclarationId(2853)); + map.insert(DeclarationId(513), DeclarationId(2856)); + map.insert(DeclarationId(515), DeclarationId(2859)); + map.insert(DeclarationId(516), DeclarationId(2862)); + map.insert(DeclarationId(539), DeclarationId(2865)); + map.insert(DeclarationId(582), DeclarationId(2868)); + map.insert(DeclarationId(602), DeclarationId(2871)); + map.insert(DeclarationId(603), DeclarationId(2874)); + map.insert(DeclarationId(605), DeclarationId(2877)); + map.insert(DeclarationId(608), DeclarationId(2880)); + map.insert(DeclarationId(613), DeclarationId(2883)); + map.insert(DeclarationId(614), DeclarationId(2886)); + map.insert(DeclarationId(618), DeclarationId(2889)); + map.insert(DeclarationId(619), DeclarationId(2892)); + map.insert(DeclarationId(620), DeclarationId(2895)); + map.insert(DeclarationId(625), DeclarationId(2898)); + map.insert(DeclarationId(1778), DeclarationId(2901)); + map.insert(DeclarationId(1782), DeclarationId(2904)); + map.insert(DeclarationId(1785), DeclarationId(2907)); + map.insert(DeclarationId(1787), DeclarationId(2910)); + map.insert(DeclarationId(1788), DeclarationId(2913)); + map.insert(DeclarationId(1789), DeclarationId(2916)); + map.insert(DeclarationId(1843), DeclarationId(2919)); + map.insert(DeclarationId(1844), DeclarationId(2922)); + map.insert(DeclarationId(1845), DeclarationId(2925)); + map.insert(DeclarationId(1846), DeclarationId(2928)); + map.insert(DeclarationId(1847), DeclarationId(2931)); + map.insert(DeclarationId(1848), DeclarationId(2934)); + map.insert(DeclarationId(1854), DeclarationId(2937)); + map.insert(DeclarationId(1909), DeclarationId(2940)); + map.insert(DeclarationId(1912), DeclarationId(2943)); + map.insert(DeclarationId(1913), DeclarationId(2946)); + map.insert(DeclarationId(1914), DeclarationId(2949)); + map.insert(DeclarationId(1915), DeclarationId(2952)); + map.insert(DeclarationId(1938), DeclarationId(2955)); + map.insert(DeclarationId(1943), DeclarationId(2958)); + map.insert(DeclarationId(1947), DeclarationId(2961)); + map.insert(DeclarationId(1950), DeclarationId(2964)); + map.insert(DeclarationId(1951), DeclarationId(2967)); + map.insert(DeclarationId(1996), DeclarationId(2970)); + map.insert(DeclarationId(1997), DeclarationId(2973)); + map.insert(DeclarationId(1998), DeclarationId(2976)); + map.insert(DeclarationId(1999), DeclarationId(2979)); + map.insert(DeclarationId(2049), DeclarationId(2982)); + map.insert(DeclarationId(2050), DeclarationId(2985)); + map.insert(DeclarationId(2064), DeclarationId(2988)); + map.insert(DeclarationId(2065), DeclarationId(2991)); + map.insert(DeclarationId(2076), DeclarationId(2994)); + map.insert(DeclarationId(2077), DeclarationId(2997)); + map.insert(DeclarationId(2079), DeclarationId(3000)); + map.insert(DeclarationId(2080), DeclarationId(3003)); + map.insert(DeclarationId(2082), DeclarationId(3006)); + map.insert(DeclarationId(2083), DeclarationId(3009)); + map.insert(DeclarationId(2085), DeclarationId(3012)); + map.insert(DeclarationId(2087), DeclarationId(3015)); + map.insert(DeclarationId(2090), DeclarationId(3018)); + map.insert(DeclarationId(2094), DeclarationId(3021)); + map.insert(DeclarationId(2096), DeclarationId(3024)); + map.insert(DeclarationId(2098), DeclarationId(3027)); + map.insert(DeclarationId(2108), DeclarationId(3030)); + map.insert(DeclarationId(2109), DeclarationId(3033)); + map.insert(DeclarationId(2110), DeclarationId(3036)); + map.insert(DeclarationId(2113), DeclarationId(3039)); + map.insert(DeclarationId(2114), DeclarationId(3042)); + map.insert(DeclarationId(2149), DeclarationId(3045)); + map.insert(DeclarationId(2150), DeclarationId(3048)); + map.insert(DeclarationId(2151), DeclarationId(3051)); + map.insert(DeclarationId(2152), DeclarationId(3054)); + map.insert(DeclarationId(2153), DeclarationId(3057)); + map.insert(DeclarationId(2176), DeclarationId(3060)); + map.insert(DeclarationId(2309), DeclarationId(3063)); + map.insert(DeclarationId(2310), DeclarationId(3066)); + map.insert(DeclarationId(2316), DeclarationId(3069)); + map.insert(DeclarationId(2317), DeclarationId(3072)); + map.insert(DeclarationId(2318), DeclarationId(3075)); + map.insert(DeclarationId(2319), DeclarationId(3078)); + map.insert(DeclarationId(2320), DeclarationId(3081)); + map.insert(DeclarationId(2321), DeclarationId(3084)); + map.insert(DeclarationId(2371), DeclarationId(3087)); + map.insert(DeclarationId(2415), DeclarationId(3090)); + map.insert(DeclarationId(2423), DeclarationId(3093)); + map.insert(DeclarationId(2437), DeclarationId(3096)); + map.insert(DeclarationId(2440), DeclarationId(3099)); + map.insert(DeclarationId(2498), DeclarationId(3102)); + map.insert(DeclarationId(2499), DeclarationId(3105)); + map.insert(DeclarationId(2500), DeclarationId(3108)); + map.insert(DeclarationId(2503), DeclarationId(3111)); + map.insert(DeclarationId(2504), DeclarationId(3114)); + map.insert(DeclarationId(2692), DeclarationId(3117)); + map.insert(DeclarationId(2721), DeclarationId(3120)); + map.insert(DeclarationId(2727), DeclarationId(3123)); + map.insert(DeclarationId(2734), DeclarationId(3126)); + map.insert(DeclarationId(2753), DeclarationId(3129)); + map.insert(DeclarationId(2754), DeclarationId(3132)); + map.insert(DeclarationId(2762), DeclarationId(3135)); + map.insert(DeclarationId(2766), DeclarationId(3138)); + map.insert(DeclarationId(2767), DeclarationId(3141)); + map.insert(DeclarationId(2768), DeclarationId(3144)); + map.insert(DeclarationId(2769), DeclarationId(3147)); + map.insert(DeclarationId(2779), DeclarationId(3150)); + map.insert(DeclarationId(2781), DeclarationId(3153)); + map.insert(DeclarationId(2782), DeclarationId(3156)); + map.insert(DeclarationId(2783), DeclarationId(3159)); + map.insert(DeclarationId(2785), DeclarationId(3162)); + map.insert(DeclarationId(2788), DeclarationId(3165)); + map.insert(DeclarationId(2789), DeclarationId(3168)); + map.insert(DeclarationId(2796), DeclarationId(3171)); + map.insert(DeclarationId(2797), DeclarationId(3174)); + map.insert(DeclarationId(2798), DeclarationId(3177)); + map.insert(DeclarationId(2800), DeclarationId(3180)); + map.insert(DeclarationId(2801), DeclarationId(3183)); + map.insert(DeclarationId(2802), DeclarationId(3186)); + map.insert(DeclarationId(2804), DeclarationId(3189)); + map.insert(DeclarationId(2805), DeclarationId(3192)); + map.insert(DeclarationId(2806), DeclarationId(3195)); + map.insert(DeclarationId(2813), DeclarationId(3198)); + map.insert(DeclarationId(2815), DeclarationId(3201)); + map.insert(DeclarationId(2826), DeclarationId(3204)); 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 7d38728b2c6..25beea6f609 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: 844, - next_declaration_id: 3102, + next_declaration_id: 3103, next_port_id: 1009, 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: 3102, + declaration_append_begin_after_bootstrap: 3103, } } @@ -9734,7 +9734,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(3102); + let mut declarations = Vec::with_capacity(3103); declarations.push(Declaration { id: DeclarationId(0), name: Some("Classical".to_string()), @@ -60314,7 +60314,7 @@ fn bootstrapped_fixture_without_parse_surface_dag_declarations() -> Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec Vec HashMap { { let mut map = HashMap::new(); - map.insert(DeclarationId(389), DeclarationId(2747)); - map.insert(DeclarationId(391), DeclarationId(2750)); - map.insert(DeclarationId(423), DeclarationId(2753)); - map.insert(DeclarationId(426), DeclarationId(2756)); - map.insert(DeclarationId(471), DeclarationId(2759)); - map.insert(DeclarationId(472), DeclarationId(2762)); - map.insert(DeclarationId(473), DeclarationId(2765)); - map.insert(DeclarationId(513), DeclarationId(2768)); - map.insert(DeclarationId(515), DeclarationId(2771)); - map.insert(DeclarationId(516), DeclarationId(2774)); - map.insert(DeclarationId(539), DeclarationId(2777)); - map.insert(DeclarationId(582), DeclarationId(2780)); - map.insert(DeclarationId(602), DeclarationId(2783)); - map.insert(DeclarationId(603), DeclarationId(2786)); - map.insert(DeclarationId(605), DeclarationId(2789)); - map.insert(DeclarationId(608), DeclarationId(2792)); - map.insert(DeclarationId(613), DeclarationId(2795)); - map.insert(DeclarationId(614), DeclarationId(2798)); - map.insert(DeclarationId(618), DeclarationId(2801)); - map.insert(DeclarationId(619), DeclarationId(2804)); - map.insert(DeclarationId(620), DeclarationId(2807)); - map.insert(DeclarationId(625), DeclarationId(2810)); - map.insert(DeclarationId(1763), DeclarationId(2813)); - map.insert(DeclarationId(1767), DeclarationId(2816)); - map.insert(DeclarationId(1770), DeclarationId(2819)); - map.insert(DeclarationId(1772), DeclarationId(2822)); - map.insert(DeclarationId(1773), DeclarationId(2825)); - map.insert(DeclarationId(1774), DeclarationId(2828)); - map.insert(DeclarationId(1828), DeclarationId(2831)); - map.insert(DeclarationId(1829), DeclarationId(2834)); - map.insert(DeclarationId(1830), DeclarationId(2837)); - map.insert(DeclarationId(1831), DeclarationId(2840)); - map.insert(DeclarationId(1832), DeclarationId(2843)); - map.insert(DeclarationId(1833), DeclarationId(2846)); - map.insert(DeclarationId(1839), DeclarationId(2849)); - map.insert(DeclarationId(1894), DeclarationId(2852)); - map.insert(DeclarationId(1897), DeclarationId(2855)); - map.insert(DeclarationId(1898), DeclarationId(2858)); - map.insert(DeclarationId(1899), DeclarationId(2861)); - map.insert(DeclarationId(1900), DeclarationId(2864)); - map.insert(DeclarationId(1923), DeclarationId(2867)); - map.insert(DeclarationId(1928), DeclarationId(2870)); - map.insert(DeclarationId(1932), DeclarationId(2873)); - map.insert(DeclarationId(1935), DeclarationId(2876)); - map.insert(DeclarationId(1936), DeclarationId(2879)); - map.insert(DeclarationId(1981), DeclarationId(2882)); - map.insert(DeclarationId(1982), DeclarationId(2885)); - map.insert(DeclarationId(1983), DeclarationId(2888)); - map.insert(DeclarationId(1984), DeclarationId(2891)); - map.insert(DeclarationId(2034), DeclarationId(2894)); - map.insert(DeclarationId(2035), DeclarationId(2897)); - map.insert(DeclarationId(2049), DeclarationId(2900)); - map.insert(DeclarationId(2050), DeclarationId(2903)); - map.insert(DeclarationId(2061), DeclarationId(2906)); - map.insert(DeclarationId(2062), DeclarationId(2909)); - map.insert(DeclarationId(2064), DeclarationId(2912)); - map.insert(DeclarationId(2065), DeclarationId(2915)); - map.insert(DeclarationId(2067), DeclarationId(2918)); - map.insert(DeclarationId(2068), DeclarationId(2921)); - map.insert(DeclarationId(2070), DeclarationId(2924)); - map.insert(DeclarationId(2072), DeclarationId(2927)); - map.insert(DeclarationId(2075), DeclarationId(2930)); - map.insert(DeclarationId(2079), DeclarationId(2933)); - map.insert(DeclarationId(2081), DeclarationId(2936)); - map.insert(DeclarationId(2083), DeclarationId(2939)); - map.insert(DeclarationId(2093), DeclarationId(2942)); - map.insert(DeclarationId(2094), DeclarationId(2945)); - map.insert(DeclarationId(2095), DeclarationId(2948)); - map.insert(DeclarationId(2098), DeclarationId(2951)); - map.insert(DeclarationId(2099), DeclarationId(2954)); - map.insert(DeclarationId(2134), DeclarationId(2957)); - map.insert(DeclarationId(2135), DeclarationId(2960)); - map.insert(DeclarationId(2136), DeclarationId(2963)); - map.insert(DeclarationId(2137), DeclarationId(2966)); - map.insert(DeclarationId(2138), DeclarationId(2969)); - map.insert(DeclarationId(2161), DeclarationId(2972)); - map.insert(DeclarationId(2294), DeclarationId(2975)); - map.insert(DeclarationId(2295), DeclarationId(2978)); - map.insert(DeclarationId(2301), DeclarationId(2981)); - map.insert(DeclarationId(2302), DeclarationId(2984)); - map.insert(DeclarationId(2303), DeclarationId(2987)); - map.insert(DeclarationId(2304), DeclarationId(2990)); - map.insert(DeclarationId(2305), DeclarationId(2993)); - map.insert(DeclarationId(2306), DeclarationId(2996)); - map.insert(DeclarationId(2411), DeclarationId(2999)); - map.insert(DeclarationId(2412), DeclarationId(3002)); - map.insert(DeclarationId(2413), DeclarationId(3005)); - map.insert(DeclarationId(2416), DeclarationId(3008)); - map.insert(DeclarationId(2417), DeclarationId(3011)); - map.insert(DeclarationId(2605), DeclarationId(3014)); - map.insert(DeclarationId(2633), DeclarationId(3017)); - map.insert(DeclarationId(2639), DeclarationId(3020)); - map.insert(DeclarationId(2646), DeclarationId(3023)); - map.insert(DeclarationId(2665), DeclarationId(3026)); - map.insert(DeclarationId(2666), DeclarationId(3029)); - map.insert(DeclarationId(2674), DeclarationId(3032)); - map.insert(DeclarationId(2678), DeclarationId(3035)); - map.insert(DeclarationId(2679), DeclarationId(3038)); - map.insert(DeclarationId(2680), DeclarationId(3041)); - map.insert(DeclarationId(2681), DeclarationId(3044)); - map.insert(DeclarationId(2691), DeclarationId(3047)); - map.insert(DeclarationId(2693), DeclarationId(3050)); - map.insert(DeclarationId(2694), DeclarationId(3053)); - map.insert(DeclarationId(2695), DeclarationId(3056)); - map.insert(DeclarationId(2697), DeclarationId(3059)); - map.insert(DeclarationId(2700), DeclarationId(3062)); - map.insert(DeclarationId(2701), DeclarationId(3065)); - map.insert(DeclarationId(2708), DeclarationId(3068)); - map.insert(DeclarationId(2709), DeclarationId(3071)); - map.insert(DeclarationId(2710), DeclarationId(3074)); - map.insert(DeclarationId(2712), DeclarationId(3077)); - map.insert(DeclarationId(2713), DeclarationId(3080)); - map.insert(DeclarationId(2714), DeclarationId(3083)); - map.insert(DeclarationId(2716), DeclarationId(3086)); - map.insert(DeclarationId(2717), DeclarationId(3089)); - map.insert(DeclarationId(2718), DeclarationId(3092)); - map.insert(DeclarationId(2725), DeclarationId(3095)); - map.insert(DeclarationId(2727), DeclarationId(3098)); - map.insert(DeclarationId(2738), DeclarationId(3101)); + map.insert(DeclarationId(389), DeclarationId(2748)); + map.insert(DeclarationId(391), DeclarationId(2751)); + map.insert(DeclarationId(423), DeclarationId(2754)); + map.insert(DeclarationId(426), DeclarationId(2757)); + map.insert(DeclarationId(471), DeclarationId(2760)); + map.insert(DeclarationId(472), DeclarationId(2763)); + map.insert(DeclarationId(473), DeclarationId(2766)); + map.insert(DeclarationId(513), DeclarationId(2769)); + map.insert(DeclarationId(515), DeclarationId(2772)); + map.insert(DeclarationId(516), DeclarationId(2775)); + map.insert(DeclarationId(539), DeclarationId(2778)); + map.insert(DeclarationId(582), DeclarationId(2781)); + map.insert(DeclarationId(602), DeclarationId(2784)); + map.insert(DeclarationId(603), DeclarationId(2787)); + map.insert(DeclarationId(605), DeclarationId(2790)); + map.insert(DeclarationId(608), DeclarationId(2793)); + map.insert(DeclarationId(613), DeclarationId(2796)); + map.insert(DeclarationId(614), DeclarationId(2799)); + map.insert(DeclarationId(618), DeclarationId(2802)); + map.insert(DeclarationId(619), DeclarationId(2805)); + map.insert(DeclarationId(620), DeclarationId(2808)); + map.insert(DeclarationId(625), DeclarationId(2811)); + map.insert(DeclarationId(1763), DeclarationId(2814)); + map.insert(DeclarationId(1767), DeclarationId(2817)); + map.insert(DeclarationId(1770), DeclarationId(2820)); + map.insert(DeclarationId(1772), DeclarationId(2823)); + map.insert(DeclarationId(1773), DeclarationId(2826)); + map.insert(DeclarationId(1774), DeclarationId(2829)); + map.insert(DeclarationId(1828), DeclarationId(2832)); + map.insert(DeclarationId(1829), DeclarationId(2835)); + map.insert(DeclarationId(1830), DeclarationId(2838)); + map.insert(DeclarationId(1831), DeclarationId(2841)); + map.insert(DeclarationId(1832), DeclarationId(2844)); + map.insert(DeclarationId(1833), DeclarationId(2847)); + map.insert(DeclarationId(1839), DeclarationId(2850)); + map.insert(DeclarationId(1894), DeclarationId(2853)); + map.insert(DeclarationId(1897), DeclarationId(2856)); + map.insert(DeclarationId(1898), DeclarationId(2859)); + map.insert(DeclarationId(1899), DeclarationId(2862)); + map.insert(DeclarationId(1900), DeclarationId(2865)); + map.insert(DeclarationId(1923), DeclarationId(2868)); + map.insert(DeclarationId(1928), DeclarationId(2871)); + map.insert(DeclarationId(1932), DeclarationId(2874)); + map.insert(DeclarationId(1935), DeclarationId(2877)); + map.insert(DeclarationId(1936), DeclarationId(2880)); + map.insert(DeclarationId(1981), DeclarationId(2883)); + map.insert(DeclarationId(1982), DeclarationId(2886)); + map.insert(DeclarationId(1983), DeclarationId(2889)); + map.insert(DeclarationId(1984), DeclarationId(2892)); + map.insert(DeclarationId(2034), DeclarationId(2895)); + map.insert(DeclarationId(2035), DeclarationId(2898)); + map.insert(DeclarationId(2049), DeclarationId(2901)); + map.insert(DeclarationId(2050), DeclarationId(2904)); + map.insert(DeclarationId(2061), DeclarationId(2907)); + map.insert(DeclarationId(2062), DeclarationId(2910)); + map.insert(DeclarationId(2064), DeclarationId(2913)); + map.insert(DeclarationId(2065), DeclarationId(2916)); + map.insert(DeclarationId(2067), DeclarationId(2919)); + map.insert(DeclarationId(2068), DeclarationId(2922)); + map.insert(DeclarationId(2070), DeclarationId(2925)); + map.insert(DeclarationId(2072), DeclarationId(2928)); + map.insert(DeclarationId(2075), DeclarationId(2931)); + map.insert(DeclarationId(2079), DeclarationId(2934)); + map.insert(DeclarationId(2081), DeclarationId(2937)); + map.insert(DeclarationId(2083), DeclarationId(2940)); + map.insert(DeclarationId(2093), DeclarationId(2943)); + map.insert(DeclarationId(2094), DeclarationId(2946)); + map.insert(DeclarationId(2095), DeclarationId(2949)); + map.insert(DeclarationId(2098), DeclarationId(2952)); + map.insert(DeclarationId(2099), DeclarationId(2955)); + map.insert(DeclarationId(2134), DeclarationId(2958)); + map.insert(DeclarationId(2135), DeclarationId(2961)); + map.insert(DeclarationId(2136), DeclarationId(2964)); + map.insert(DeclarationId(2137), DeclarationId(2967)); + map.insert(DeclarationId(2138), DeclarationId(2970)); + map.insert(DeclarationId(2161), DeclarationId(2973)); + map.insert(DeclarationId(2294), DeclarationId(2976)); + map.insert(DeclarationId(2295), DeclarationId(2979)); + map.insert(DeclarationId(2301), DeclarationId(2982)); + map.insert(DeclarationId(2302), DeclarationId(2985)); + map.insert(DeclarationId(2303), DeclarationId(2988)); + map.insert(DeclarationId(2304), DeclarationId(2991)); + map.insert(DeclarationId(2305), DeclarationId(2994)); + map.insert(DeclarationId(2306), DeclarationId(2997)); + map.insert(DeclarationId(2411), DeclarationId(3000)); + map.insert(DeclarationId(2412), DeclarationId(3003)); + map.insert(DeclarationId(2413), DeclarationId(3006)); + map.insert(DeclarationId(2416), DeclarationId(3009)); + map.insert(DeclarationId(2417), DeclarationId(3012)); + map.insert(DeclarationId(2605), DeclarationId(3015)); + map.insert(DeclarationId(2634), DeclarationId(3018)); + map.insert(DeclarationId(2640), DeclarationId(3021)); + map.insert(DeclarationId(2647), DeclarationId(3024)); + map.insert(DeclarationId(2666), DeclarationId(3027)); + map.insert(DeclarationId(2667), DeclarationId(3030)); + map.insert(DeclarationId(2675), DeclarationId(3033)); + map.insert(DeclarationId(2679), DeclarationId(3036)); + map.insert(DeclarationId(2680), DeclarationId(3039)); + map.insert(DeclarationId(2681), DeclarationId(3042)); + map.insert(DeclarationId(2682), DeclarationId(3045)); + map.insert(DeclarationId(2692), DeclarationId(3048)); + map.insert(DeclarationId(2694), DeclarationId(3051)); + map.insert(DeclarationId(2695), DeclarationId(3054)); + map.insert(DeclarationId(2696), DeclarationId(3057)); + map.insert(DeclarationId(2698), DeclarationId(3060)); + map.insert(DeclarationId(2701), DeclarationId(3063)); + map.insert(DeclarationId(2702), DeclarationId(3066)); + map.insert(DeclarationId(2709), DeclarationId(3069)); + map.insert(DeclarationId(2710), DeclarationId(3072)); + map.insert(DeclarationId(2711), DeclarationId(3075)); + map.insert(DeclarationId(2713), DeclarationId(3078)); + map.insert(DeclarationId(2714), DeclarationId(3081)); + map.insert(DeclarationId(2715), DeclarationId(3084)); + map.insert(DeclarationId(2717), DeclarationId(3087)); + map.insert(DeclarationId(2718), DeclarationId(3090)); + map.insert(DeclarationId(2719), DeclarationId(3093)); + map.insert(DeclarationId(2726), DeclarationId(3096)); + map.insert(DeclarationId(2728), DeclarationId(3099)); + map.insert(DeclarationId(2739), DeclarationId(3102)); map } } diff --git a/src/v3/compiler/tests/integration/extdeps_rust_primitives_loader_test.rs b/src/v3/compiler/tests/integration/extdeps_rust_primitives_loader_test.rs index a6263555133..eee7db45b6b 100644 --- a/src/v3/compiler/tests/integration/extdeps_rust_primitives_loader_test.rs +++ b/src/v3/compiler/tests/integration/extdeps_rust_primitives_loader_test.rs @@ -2,7 +2,7 @@ //! //! T-Ground-Engine Phase-1 unblock (Path 2): `dsl/extdeps/languages/rust/ //! primitives.dag` is loaded into the bootstrap Dag; `Dag::rust_pilot_primitives` -//! returns a walkable type-structure declaration. The 10-element pilot +//! returns a walkable type-structure declaration. The Rust pilot //! enumeration is walkable as `ValueBody::List` after R2 T-Substrate's //! 4th sub-lane lands the top-level list extension. @@ -116,10 +116,12 @@ fn rust_pilot_primitives_value_body_is_structural_list() { let ValueBody::List(elements) = body else { panic!("rust_pilot_primitives.value_body must lower to ValueBody::List, got {body:?}"); }; - // R3 Phase B (Director Path A RATIFIED at gunbc#1739 #issuecomment-4392731264): - // 10 IntegerPrimitive (i8..i64, i128, u8..u64, u128) + 2 NonIntegerPrimitive (bool, ()). + // R3 Phase B (Director Path A RATIFIED at gunbc#1739 #issuecomment-4392731264) + // + G2 Float candidate slice: + // 10 IntegerPrimitive (i8..i64, i128, u8..u64, u128) + 4 NonIntegerPrimitive + // (f32, f64, bool, ()). // u128 row unblocked by Phase A `IntervalInt::ExactInterval` BigInt host repr widening. - assert_eq!(elements.len(), 12); + assert_eq!(elements.len(), 14); let constructors: Vec<&str> = elements .iter() .map(|element| { diff --git a/src/v3/grounding_engine/src/lib.rs b/src/v3/grounding_engine/src/lib.rs index b97ce654d0c..7e1017fb440 100644 --- a/src/v3/grounding_engine/src/lib.rs +++ b/src/v3/grounding_engine/src/lib.rs @@ -5,7 +5,7 @@ //! //! **Phase 2 (sharpened-(b), enumeration slice)** walks //! `rust_pilot_primitives.value_body` as [`ValueBody::List`] and checks that -//! the first pilot row matches the authority ordering in +//! each pilot row matches the authority ordering in //! `dsl/extdeps/languages/rust/primitives.dag` (asserted here via the pilot //! crate's `RUST_PILOT_PRIMITIVES` mirror until mirror retirement completes). //! @@ -131,7 +131,11 @@ pub fn validate_rust_primitive_type_structure( let non_integer_algebra = expect_enum_shape( dag, "NonIntegerAlgebra", - &["BooleanAlgebraAlgebra", "TerminalAlgebra"], + &[ + "ApproximateFieldAlgebra", + "BooleanAlgebraAlgebra", + "TerminalAlgebra", + ], )?; let target_carrier = expect_enum_shape( dag, @@ -172,12 +176,12 @@ pub fn validate_mirror_consistency() -> StructureResult<()> { } validate_pilot_values_with_shape(&shape)?; validate_rust_pilot_primitives_target_name_multiset_matches_mirror()?; - validate_first_rust_pilot_row_matches_mirror() + validate_rust_pilot_rows_match_mirror() } /// Cementing receipt (R3 / gunbc#2461): every `target_name` in the lowered /// `rust_pilot_primitives` list matches the multiset carried by -/// `RUST_PILOT_PRIMITIVES`, with substrate (`.dag`) as authority — fail-closed +/// `RUST_PILOT_PRIMITIVES`, with substrate (`.dag`) as authority - fail-closed /// if either side introduces or drops a name the other lacks. pub fn validate_rust_pilot_primitives_target_name_multiset_matches_mirror() -> StructureResult<()> { let dag = Dag::new(); @@ -235,9 +239,9 @@ pub fn validate_rust_pilot_primitives_target_name_multiset_matches_mirror() -> S Ok(()) } -/// Phase 2: the first lowered `rust_pilot_primitives` list element must match -/// `RUST_PILOT_PRIMITIVES[0]` (authority ordering in `primitives.dag`). -pub fn validate_first_rust_pilot_row_matches_mirror() -> StructureResult<()> { +/// Phase 2: every lowered `rust_pilot_primitives` list element must match the +/// mirror row at the same position (authority ordering in `primitives.dag`). +pub fn validate_rust_pilot_rows_match_mirror() -> StructureResult<()> { let dag = Dag::new(); let pilot_list = dag .rust_pilot_primitives() @@ -270,53 +274,62 @@ pub fn validate_first_rust_pilot_row_matches_mirror() -> StructureResult<()> { actual: value_body_kind(body), }); }; - let first = elements.first().ok_or_else(|| StructureMismatch { - location: "rust_pilot_primitives.value_body".to_string(), - expected: "non-empty pilot list".to_string(), - actual: "empty list".to_string(), - })?; + if elements.len() != RUST_PILOT_PRIMITIVES.len() { + return Err(StructureMismatch { + location: "rust_pilot_primitives.value_body".to_string(), + expected: format!("{} mirror rows", RUST_PILOT_PRIMITIVES.len()), + actual: format!("{} loaded rows", elements.len()), + }); + } + + for (idx, (element, mirror)) in elements.iter().zip(RUST_PILOT_PRIMITIVES).enumerate() { + assert_rust_pilot_row_matches_mirror(&dag, &disj_variants, idx, element, mirror)?; + } + Ok(()) +} + +fn assert_rust_pilot_row_matches_mirror( + dag: &Dag, + disj_variants: &[Field], + idx: usize, + element: &FieldValue, + mirror: &PilotRustPrimitive, +) -> StructureResult<()> { + let location = format!("rust_pilot_primitives[{idx}]"); let FieldValue::Variant { constructor, payload, - } = first + } = element else { return Err(StructureMismatch { - location: "rust_pilot_primitives[0]".to_string(), + location, expected: "FieldValue::Variant".to_string(), - actual: field_value_kind(first), + actual: field_value_kind(element), }); }; - let variant_label = rust_primitive_variant_label(&disj_variants, *constructor)?; - let mirror0 = RUST_PILOT_PRIMITIVES - .first() - .ok_or_else(|| StructureMismatch { - location: "RUST_PILOT_PRIMITIVES".to_string(), - expected: "non-empty mirror slice".to_string(), - actual: "empty".to_string(), - })?; - + let variant_label = rust_primitive_variant_label(disj_variants, *constructor, idx)?; let label = variant_label.as_str(); - match mirror0 { + match mirror { PilotRustPrimitive::IntegerPrimitive { .. } => { if label != "IntegerPrimitive" { return Err(StructureMismatch { - location: "rust_pilot_primitives[0]".to_string(), - expected: "IntegerPrimitive (first authority row)".to_string(), + location, + expected: "IntegerPrimitive authority row".to_string(), actual: label.to_string(), }); } - assert_integer_primitive_payload_matches(&dag, payload, mirror0) + assert_integer_primitive_payload_matches(dag, payload, mirror) } PilotRustPrimitive::NonIntegerPrimitive { .. } => { if label != "NonIntegerPrimitive" { return Err(StructureMismatch { - location: "rust_pilot_primitives[0]".to_string(), - expected: "NonIntegerPrimitive (first authority row)".to_string(), + location, + expected: "NonIntegerPrimitive authority row".to_string(), actual: label.to_string(), }); } - assert_non_integer_primitive_payload_matches(&dag, payload, mirror0) + assert_non_integer_primitive_payload_matches(dag, payload, mirror) } } } @@ -511,7 +524,11 @@ fn expected_mirror_shape() -> RustPrimitiveTypeShape { integer_algebra: enum_shape("IntegerAlgebra", &["OrderedRingAlgebra", "SemiringAlgebra"]), non_integer_algebra: enum_shape( "NonIntegerAlgebra", - &["BooleanAlgebraAlgebra", "TerminalAlgebra"], + &[ + "ApproximateFieldAlgebra", + "BooleanAlgebraAlgebra", + "TerminalAlgebra", + ], ), target_carrier: enum_shape( "TargetCarrier", @@ -635,6 +652,7 @@ fn pilot_integer_algebra_name(algebra: PilotIntegerAlgebra) -> &'static str { fn pilot_non_integer_algebra_name(algebra: PilotNonIntegerAlgebra) -> &'static str { match algebra { + PilotNonIntegerAlgebra::ApproximateField => "ApproximateFieldAlgebra", PilotNonIntegerAlgebra::BooleanAlgebra => "BooleanAlgebraAlgebra", PilotNonIntegerAlgebra::Terminal => "TerminalAlgebra", } @@ -684,13 +702,14 @@ fn field_value_kind(value: &FieldValue) -> String { fn rust_primitive_variant_label( disj_variants: &[Field], constructor: DeclarationId, + row_index: usize, ) -> StructureResult { disj_variants .iter() .find(|variant| variant.ty == constructor) .map(|variant| variant.label.clone()) .ok_or_else(|| StructureMismatch { - location: "rust_pilot_primitives[0].constructor".to_string(), + location: format!("rust_pilot_primitives[{row_index}].constructor"), expected: "constructor id belonging to RustPrimitive".to_string(), actual: "unknown constructor".to_string(), }) @@ -804,7 +823,7 @@ fn assert_integer_primitive_payload_matches( } = pilot else { return Err(StructureMismatch { - location: "validate_first_rust_pilot_row_matches_mirror".to_string(), + location: "validate_rust_pilot_rows_match_mirror".to_string(), expected: "IntegerPrimitive mirror row".to_string(), actual: "NonIntegerPrimitive".to_string(), }); @@ -879,7 +898,7 @@ fn assert_non_integer_primitive_payload_matches( } = pilot else { return Err(StructureMismatch { - location: "validate_first_rust_pilot_row_matches_mirror".to_string(), + location: "validate_rust_pilot_rows_match_mirror".to_string(), expected: "NonIntegerPrimitive mirror row".to_string(), actual: "IntegerPrimitive".to_string(), }); @@ -897,7 +916,11 @@ fn assert_non_integer_primitive_payload_matches( let alg = expect_nullary_variant_label( dag, "NonIntegerAlgebra", - &["BooleanAlgebraAlgebra", "TerminalAlgebra"], + &[ + "ApproximateFieldAlgebra", + "BooleanAlgebraAlgebra", + "TerminalAlgebra", + ], &payload[1], &format!("{ctx}.algebra"), )?; @@ -951,9 +974,9 @@ mod tests { } #[test] - fn first_enumerated_pilot_row_matches_mirror_i8() { - validate_first_rust_pilot_row_matches_mirror() - .expect("first lowered list row matches RUST_PILOT_PRIMITIVES[0] (i8)"); + fn all_enumerated_pilot_rows_match_mirror_including_floats() { + validate_rust_pilot_rows_match_mirror() + .expect("all lowered list rows match RUST_PILOT_PRIMITIVES, including f32/f64"); } #[test] diff --git a/src/v3/grounding_pilot/src/lib.rs b/src/v3/grounding_pilot/src/lib.rs index b3c2d2e8ad5..6449b325034 100644 --- a/src/v3/grounding_pilot/src/lib.rs +++ b/src/v3/grounding_pilot/src/lib.rs @@ -4,7 +4,7 @@ // Validate that algebra-homomorphism inhabitance search reproduces // today's name-keyed table-lookup routing for the Rust target on a // bounded primitive set: {i8, i16, i32, i64, i128, u8, u16, u32, u64, u128, -// bool, ()}. +// f32, f64, bool, ()}. // (T-Int128 Slice B1 added i128. R3 Phase B-1 (commit `59511503e`) closed the // prior `u128` deferral by widening `IntervalInt::ExactInterval` to a BigInt // host repr — `u128::MAX` now fits — and the substrate `u128` row landed in @@ -87,6 +87,7 @@ pub enum IntegerAlgebra { #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum NonIntegerAlgebra { + ApproximateField, BooleanAlgebra, Terminal, } @@ -283,6 +284,19 @@ pub const RUST_PILOT_PRIMITIVES: &[RustPrimitive] = &[ is_copy: true, overflow: IntegerOverflow::TwoComplementWrap, }, + // Floats — ApproximateField over machine-width carriers. + RustPrimitive::NonIntegerPrimitive { + target_name: "f32", + algebra: NonIntegerAlgebra::ApproximateField, + carrier: TargetCarrier::Word32, + is_copy: true, + }, + RustPrimitive::NonIntegerPrimitive { + target_name: "f64", + algebra: NonIntegerAlgebra::ApproximateField, + carrier: TargetCarrier::Word64, + is_copy: true, + }, // Bool — BooleanAlgebra over Bit. RustPrimitive::NonIntegerPrimitive { target_name: "bool", @@ -302,10 +316,10 @@ pub const RUST_PILOT_PRIMITIVES: &[RustPrimitive] = &[ // ============================================================================= // Structural .dag-side facts. // -// Mirrors dsl/std/integer.dag (Int8..Int64 + Int128, UInt8..UInt64 + UInt128) -// and the std-side declarations of Bool and Unit. Each .dag-side type unfolds -// to a RoutingKey; production resolution will read the real type-alias -// chain via the v3 substrate's resolve_item_types. +// Mirrors dsl/std/integer.dag (Int8..Int64 + Int128, UInt8..UInt64 + UInt128), +// dsl/std/float.dag (Float32/Float64), and the std-side declarations of Bool +// and Unit. Each .dag-side type unfolds to a RoutingKey; production resolution +// will read the real type-alias chain via the v3 substrate's resolve_item_types. // ============================================================================= #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -320,6 +334,8 @@ pub enum DagType { UInt32, UInt64, UInt128, + Float32, + Float64, Bool, Unit, } @@ -335,15 +351,17 @@ pub const DAG_PILOT_TYPES: &[DagType] = &[ DagType::UInt32, DagType::UInt64, DagType::UInt128, + DagType::Float32, + DagType::Float64, DagType::Bool, DagType::Unit, ]; /// Unfold a pilot .dag-side type to its routing-key facts. /// -/// Authority: dsl/std/integer.dag (Int8..Int64 + Int128, UInt8..UInt64 + UInt128), plus the -/// canonical std modeling of Bool as BooleanAlgebra and Unit as the -/// terminal object. +/// Authority: dsl/std/integer.dag (Int8..Int64 + Int128, UInt8..UInt64 + UInt128), +/// dsl/std/float.dag (Float32/Float64), plus the canonical std modeling of Bool +/// as BooleanAlgebra and Unit as the terminal object. pub fn dag_type_facts(t: DagType) -> RoutingKey { match t { DagType::Int8 => RoutingKey::Integer { @@ -386,6 +404,14 @@ pub fn dag_type_facts(t: DagType) -> RoutingKey { algebra: IntegerAlgebra::Semiring, carrier: TargetCarrier::Word128, }, + DagType::Float32 => RoutingKey::NonInteger { + algebra: NonIntegerAlgebra::ApproximateField, + carrier: TargetCarrier::Word32, + }, + DagType::Float64 => RoutingKey::NonInteger { + algebra: NonIntegerAlgebra::ApproximateField, + carrier: TargetCarrier::Word64, + }, DagType::Bool => RoutingKey::NonInteger { algebra: NonIntegerAlgebra::BooleanAlgebra, carrier: TargetCarrier::Bit, @@ -455,11 +481,11 @@ pub fn ground(t: DagType) -> Result<&'static RustPrimitive, GroundingError> { // // Two strata (see PR description): // A. Name-keyed parity. dsl/extdeps/languages/rust/types.dag's -// rust_type_checkpoints declares 3 of the 10 pilot types: Int (= Int64) +// rust_type_checkpoints declares 3 of the 14 pilot types: Int (= Int64) // → "i64", Bool → "bool", Unit → "()". The engine must produce the // same target_name on these. -// B. Algebra-homomorphism extension. The remaining 7 pilot types -// (Int8/16/32, UInt8..UInt64) have no name-keyed checkpoint in +// B. Algebra-homomorphism extension. The remaining pilot types +// (Int8/16/32/128, UInt8..UInt128, Float32/Float64) have no name-keyed checkpoint in // types.dag — the only fallback is the OrderedRing → "i64" // algebra-inhabitant entry, which is width-blind and would // mis-route Int8 to i64. The engine must produce the @@ -554,6 +580,28 @@ mod tests { } } + /// Stratum B — width-distinct floats route via ApproximateField plus the + /// machine-width carrier. These rows are post-S8 Float coverage: + /// `Float32/Float64 = Compose>`. + #[test] + fn stratum_b_float_widths_route_correctly() { + for (dag, expected, carrier) in [ + (DagType::Float32, "f32", TargetCarrier::Word32), + (DagType::Float64, "f64", TargetCarrier::Word64), + ] { + let p = ground(dag).unwrap_or_else(|e| panic!("{dag:?} must ground: {e:?}")); + assert_eq!(target_name(p), expected, "routing for {dag:?}"); + assert!(matches!( + p, + RustPrimitive::NonIntegerPrimitive { + algebra: NonIntegerAlgebra::ApproximateField, + carrier: actual, + .. + } if *actual == carrier + )); + } + } + /// Coverage — every type in DAG_PILOT_TYPES grounds to exactly one /// primitive. Asserts the pilot set is fully covered. #[test] @@ -565,7 +613,7 @@ mod tests { } /// Coverage — engine output names exactly match the canonical - /// expectation across all 10 pilot types in one place. + /// expectation across all 14 pilot types in one place. #[test] fn full_pilot_routing_table() { let expected: &[(DagType, &str)] = &[ @@ -579,6 +627,8 @@ mod tests { (DagType::UInt32, "u32"), (DagType::UInt64, "u64"), (DagType::UInt128, "u128"), + (DagType::Float32, "f32"), + (DagType::Float64, "f64"), (DagType::Bool, "bool"), (DagType::Unit, "()"), ];