diff --git a/compiler/qsc_partial_eval/src/tests/calls.rs b/compiler/qsc_partial_eval/src/tests/calls.rs index abb17c5203..f614c7120c 100644 --- a/compiler/qsc_partial_eval/src/tests/calls.rs +++ b/compiler/qsc_partial_eval/src/tests/calls.rs @@ -1256,7 +1256,7 @@ fn call_to_unresolved_callee_with_dynamic_arg_fails() { assert_error( &error, - &expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 298, hi: 305 }))"], + &expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 288, hi: 295 }))"], ); } @@ -1283,7 +1283,7 @@ fn call_to_unresolved_callee_producing_dynamic_value_fails() { assert_error( &error, - &expect!["UnexpectedDynamicValue(PackageSpan { package: PackageId(2), span: Span { lo: 298, hi: 305 } })"], + &expect!["UnexpectedDynamicValue(PackageSpan { package: PackageId(2), span: Span { lo: 288, hi: 295 } })"], ); } @@ -1309,7 +1309,7 @@ fn call_to_unresolved_callee_via_closure_with_dynamic_arg_fails() { assert_error( &error, - &expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 302, hi: 309 }))"], + &expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 292, hi: 299 }))"], ); } diff --git a/compiler/qsc_partial_eval/src/tests/returns.rs b/compiler/qsc_partial_eval/src/tests/returns.rs index 45f993c86d..fc3108f61c 100644 --- a/compiler/qsc_partial_eval/src/tests/returns.rs +++ b/compiler/qsc_partial_eval/src/tests/returns.rs @@ -898,9 +898,7 @@ fn explicit_return_embedded_in_assign_field_expr_yields_error() { "#}); assert_error( &error, - &expect![[ - r#"Unexpected("updating a field of a dynamic user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 217, hi: 243 } })"# - ]], + &expect![[r#"Unexpected("updating a field of a dynamic user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 207, hi: 233 } })"#]], ); } @@ -981,9 +979,7 @@ fn explicit_return_embedded_in_call_expr_yields_error() { "#}); assert_error( &error, - &expect![[ - r#"Unexpected("embedded return in call arguments", PackageSpan { package: PackageId(2), span: Span { lo: 174, hi: 186 } })"# - ]], + &expect![[r#"Unexpected("embedded return in call arguments", PackageSpan { package: PackageId(2), span: Span { lo: 164, hi: 176 } })"#]], ); } @@ -1004,9 +1000,7 @@ fn explicit_return_embedded_in_if_expr_yields_error() { "#}); assert_error( &error, - &expect![[ - r#"Unexpected("embedded return in if condition", PackageSpan { package: PackageId(2), span: Span { lo: 175, hi: 187 } })"# - ]], + &expect![[r#"Unexpected("embedded return in if condition", PackageSpan { package: PackageId(2), span: Span { lo: 165, hi: 177 } })"#]], ); } @@ -1087,9 +1081,7 @@ fn explicit_return_embedded_in_update_field_expr_yields_error() { "#}); assert_error( &error, - &expect![[ - r#"Unexpected("assigning a dynamic value to a field of a user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 211, hi: 241 } })"# - ]], + &expect![[r#"Unexpected("assigning a dynamic value to a field of a user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 201, hi: 231 } })"#]], ); } diff --git a/compiler/qsc_passes/src/capabilitiesck/tests_adaptive.rs b/compiler/qsc_passes/src/capabilitiesck/tests_adaptive.rs index 25f94904a9..57d468b5b1 100644 --- a/compiler/qsc_passes/src/capabilitiesck/tests_adaptive.rs +++ b/compiler/qsc_passes/src/capabilitiesck/tests_adaptive.rs @@ -57,8 +57,8 @@ fn use_of_dynamic_int_yields_error() { [ UseOfDynamicInt( Span { - lo: 246, - hi: 271, + lo: 226, + hi: 251, }, ), ] @@ -114,14 +114,14 @@ fn use_of_dynamic_double_yields_errors() { [ UseOfDynamicInt( Span { - lo: 246, - hi: 284, + lo: 226, + hi: 264, }, ), UseOfDynamicDouble( Span { - lo: 246, - hi: 284, + lo: 226, + hi: 264, }, ), ] @@ -154,14 +154,14 @@ fn use_of_dynamic_big_int_yields_errors() { [ UseOfDynamicInt( Span { - lo: 247, - hi: 285, + lo: 227, + hi: 265, }, ), UseOfDynamicBigInt( Span { - lo: 247, - hi: 285, + lo: 227, + hi: 265, }, ), ] @@ -217,20 +217,20 @@ fn use_of_dynamic_udt_yields_errors() { [ UseOfDynamicInt( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), UseOfDynamicDouble( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), UseOfDynamicUdt( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), ] @@ -246,8 +246,8 @@ fn use_of_dynamic_function_yields_errors() { [ UseOfDynamicArrowFunction( Span { - lo: 142, - hi: 166, + lo: 132, + hi: 156, }, ), ] @@ -263,8 +263,8 @@ fn use_of_dynamic_operation_yields_errors() { [ UseOfDynamicArrowOperation( Span { - lo: 142, - hi: 162, + lo: 132, + hi: 152, }, ), ] @@ -371,26 +371,26 @@ fn call_to_dynamic_function_yields_errors() { [ UseOfDynamicArrowFunction( Span { - lo: 142, - hi: 166, + lo: 132, + hi: 156, }, ), UseOfDynamicDouble( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), UseOfDynamicArrowFunction( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), CallToDynamicCallee( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), ] @@ -406,20 +406,20 @@ fn call_to_dynamic_operation_yields_errors() { [ UseOfDynamicArrowOperation( Span { - lo: 142, - hi: 162, + lo: 132, + hi: 152, }, ), UseOfDynamicArrowOperation( Span { - lo: 176, - hi: 181, + lo: 166, + hi: 171, }, ), CallToDynamicCallee( Span { - lo: 176, - hi: 181, + lo: 166, + hi: 171, }, ), ] @@ -455,20 +455,20 @@ fn use_of_dynamic_index_yields_errors() { [ UseOfDynamicInt( Span { - lo: 246, - hi: 271, + lo: 226, + hi: 251, }, ), UseOfDynamicInt( Span { - lo: 319, - hi: 323, + lo: 299, + hi: 303, }, ), UseOfDynamicIndex( Span { - lo: 319, - hi: 323, + lo: 299, + hi: 303, }, ), ] diff --git a/compiler/qsc_passes/src/capabilitiesck/tests_adaptive_plus_integers.rs b/compiler/qsc_passes/src/capabilitiesck/tests_adaptive_plus_integers.rs index d687b998d9..88a3640dd5 100644 --- a/compiler/qsc_passes/src/capabilitiesck/tests_adaptive_plus_integers.rs +++ b/compiler/qsc_passes/src/capabilitiesck/tests_adaptive_plus_integers.rs @@ -111,8 +111,8 @@ fn use_of_dynamic_double_yields_error() { [ UseOfDynamicDouble( Span { - lo: 246, - hi: 284, + lo: 226, + hi: 264, }, ), ] @@ -145,8 +145,8 @@ fn use_of_dynamic_big_int_yields_errors() { [ UseOfDynamicBigInt( Span { - lo: 247, - hi: 285, + lo: 227, + hi: 265, }, ), ] @@ -196,14 +196,14 @@ fn use_of_dynamic_udt_yields_errors() { [ UseOfDynamicDouble( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), UseOfDynamicUdt( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), ] @@ -219,8 +219,8 @@ fn use_of_dynamic_function_yields_errors() { [ UseOfDynamicArrowFunction( Span { - lo: 142, - hi: 166, + lo: 132, + hi: 156, }, ), ] @@ -236,8 +236,8 @@ fn use_of_dynamic_operation_yields_errors() { [ UseOfDynamicArrowOperation( Span { - lo: 142, - hi: 162, + lo: 132, + hi: 152, }, ), ] @@ -326,26 +326,26 @@ fn call_to_dynamic_function_yields_errors() { [ UseOfDynamicArrowFunction( Span { - lo: 142, - hi: 166, + lo: 132, + hi: 156, }, ), UseOfDynamicDouble( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), UseOfDynamicArrowFunction( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), CallToDynamicCallee( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), ] @@ -361,20 +361,20 @@ fn call_to_dynamic_operation_yields_errors() { [ UseOfDynamicArrowOperation( Span { - lo: 142, - hi: 162, + lo: 132, + hi: 152, }, ), UseOfDynamicArrowOperation( Span { - lo: 176, - hi: 181, + lo: 166, + hi: 171, }, ), CallToDynamicCallee( Span { - lo: 176, - hi: 181, + lo: 166, + hi: 171, }, ), ] @@ -410,8 +410,8 @@ fn use_of_dynamic_index_yields_errors() { [ UseOfDynamicIndex( Span { - lo: 319, - hi: 323, + lo: 299, + hi: 303, }, ), ] diff --git a/compiler/qsc_passes/src/capabilitiesck/tests_base.rs b/compiler/qsc_passes/src/capabilitiesck/tests_base.rs index a721452013..c2622c6a36 100644 --- a/compiler/qsc_passes/src/capabilitiesck/tests_base.rs +++ b/compiler/qsc_passes/src/capabilitiesck/tests_base.rs @@ -64,14 +64,14 @@ fn use_of_dynamic_int_yields_errors() { [ UseOfDynamicBool( Span { - lo: 246, - hi: 271, + lo: 226, + hi: 251, }, ), UseOfDynamicInt( Span { - lo: 246, - hi: 271, + lo: 226, + hi: 251, }, ), ] @@ -136,20 +136,20 @@ fn use_of_dynamic_double_yields_errors() { [ UseOfDynamicBool( Span { - lo: 246, - hi: 284, + lo: 226, + hi: 264, }, ), UseOfDynamicInt( Span { - lo: 246, - hi: 284, + lo: 226, + hi: 264, }, ), UseOfDynamicDouble( Span { - lo: 246, - hi: 284, + lo: 226, + hi: 264, }, ), ] @@ -188,20 +188,20 @@ fn use_of_dynamic_big_int_yields_errors() { [ UseOfDynamicBool( Span { - lo: 247, - hi: 285, + lo: 227, + hi: 265, }, ), UseOfDynamicInt( Span { - lo: 247, - hi: 285, + lo: 227, + hi: 265, }, ), UseOfDynamicBigInt( Span { - lo: 247, - hi: 285, + lo: 227, + hi: 265, }, ), ] @@ -269,26 +269,26 @@ fn use_of_dynamic_udt_yields_errors() { [ UseOfDynamicBool( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), UseOfDynamicInt( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), UseOfDynamicDouble( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), UseOfDynamicUdt( Span { - lo: 283, - hi: 335, + lo: 253, + hi: 305, }, ), ] @@ -307,8 +307,8 @@ fn use_of_dynamic_function_yields_errors() { [ UseOfDynamicBool( Span { - lo: 142, - hi: 154, + lo: 132, + hi: 144, }, ), ] @@ -327,8 +327,8 @@ fn use_of_dynamic_operation_yields_errors() { [ UseOfDynamicBool( Span { - lo: 142, - hi: 154, + lo: 132, + hi: 144, }, ), ] @@ -447,32 +447,32 @@ fn call_to_dynamic_function_yields_errors() { [ UseOfDynamicBool( Span { - lo: 142, - hi: 154, + lo: 132, + hi: 144, }, ), UseOfDynamicBool( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), UseOfDynamicDouble( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), UseOfDynamicArrowFunction( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), CallToDynamicCallee( Span { - lo: 180, - hi: 188, + lo: 170, + hi: 178, }, ), ] @@ -488,26 +488,26 @@ fn call_to_dynamic_operation_yields_errors() { [ UseOfDynamicBool( Span { - lo: 142, - hi: 154, + lo: 132, + hi: 144, }, ), UseOfDynamicBool( Span { - lo: 176, - hi: 181, + lo: 166, + hi: 171, }, ), UseOfDynamicArrowOperation( Span { - lo: 176, - hi: 181, + lo: 166, + hi: 171, }, ), CallToDynamicCallee( Span { - lo: 176, - hi: 181, + lo: 166, + hi: 171, }, ), ] @@ -556,32 +556,32 @@ fn use_of_dynamic_index_yields_errors() { [ UseOfDynamicBool( Span { - lo: 246, - hi: 271, + lo: 226, + hi: 251, }, ), UseOfDynamicInt( Span { - lo: 246, - hi: 271, + lo: 226, + hi: 251, }, ), UseOfDynamicBool( Span { - lo: 319, - hi: 323, + lo: 299, + hi: 303, }, ), UseOfDynamicInt( Span { - lo: 319, - hi: 323, + lo: 299, + hi: 303, }, ), UseOfDynamicIndex( Span { - lo: 319, - hi: 323, + lo: 299, + hi: 303, }, ), ] diff --git a/wasm/src/tests.rs b/wasm/src/tests.rs index d79ba56723..b7d5bd27b0 100644 --- a/wasm/src/tests.rs +++ b/wasm/src/tests.rs @@ -411,7 +411,7 @@ fn test_compile_error_related_spans() { 1, ) .expect_err("code should fail to compile"); - expect![[r#"{"result":{"code":"Qsc.Resolve.Ambiguous","message":"name error: `DumpMachine` could refer to the item in `Other` or `Microsoft.Quantum.Diagnostics`","range":{"end":{"character":19,"line":6},"start":{"character":8,"line":6}},"related":[{"location":{"source":"test.qs","span":{"end":{"character":19,"line":6},"start":{"character":8,"line":6}}},"message":"ambiguous name"},{"location":{"source":"test.qs","span":{"end":{"character":14,"line":2},"start":{"character":9,"line":2}}},"message":"found in this namespace"},{"location":{"source":"test.qs","span":{"end":{"character":38,"line":3},"start":{"character":9,"line":3}}},"message":"and also in this namespace"}],"severity":"error"},"success":false,"type":"Result"}"#]] + expect![[r#"{"result":{"code":"Qsc.Resolve.Ambiguous","message":"name error: `DumpMachine` could refer to the item in `Other` or `Microsoft.Quantum.Diagnostics`","range":{"end":{"character":19,"line":6},"start":{"character":8,"line":6}},"related":[{"location":{"source":"test.qs","span":{"end":{"character":19,"line":6},"start":{"character":8,"line":6}}},"message":"ambiguous name"},{"location":{"source":"test.qs","span":{"end":{"character":14,"line":2},"start":{"character":9,"line":2}}},"message":"found in this namespace"},{"location":{"source":"test.qs","span":{"end":{"character":26,"line":3},"start":{"character":11,"line":3}}},"message":"and also in this namespace"}],"severity":"error"},"success":false,"type":"Result"}"#]] .assert_eq(&output.join("\n")); }